diff -Nru libepc-0.3.11/aclocal.m4 libepc-0.4.2/aclocal.m4 --- libepc-0.3.11/aclocal.m4 2010-03-23 13:08:17.000000000 +0000 +++ libepc-0.4.2/aclocal.m4 2011-10-13 14:51:53.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.10.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -13,668 +13,1019 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (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 and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.11.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 -*- + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 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. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. # -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. # -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir # -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. # -# Modified to require ngettext -# Matthias Clasen 08/06/2004 +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. # -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) +# AM_CONDITIONAL -*- Autoconf -*- -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) +# 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. -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) +# serial 9 - gt_cv_have_gettext=no +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[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])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='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= +# 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. - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" +# serial 10 - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi +# 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, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" +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=]) - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[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_$1_dependencies_compiler_type=none + 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 + # 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 + + # 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 + if test "x$enable_dependency_tracking" = xyes; then + continue + else + 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 + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $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 $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 + # 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_$1_dependencies_compiler_type=$depmode + break fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +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, 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 5 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # 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 +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# 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 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. + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# 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.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 +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 +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + 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 + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +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. +AC_REQUIRE([AC_PROG_AWK])dnl +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([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_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 +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 +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# 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 + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# 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, +# with or without modifications, as long as this notice is preserved. - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +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)]) - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi +# Copyright (C) 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. - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi +# serial 2 - # We need to process the po/ directory. - POSUB=po +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done +# Copyright (C) 1996, 1998, 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. - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) +# serial 5 -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi +# Check to see how 'make' treats includes. -*- Autoconf -*- - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) +# 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. - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) +# serial 4 -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# 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 + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf ]) -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_in,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl +# Copyright (C) 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. -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) +# serial 6 + +# AM_PROG_CC_C_O +# -------------- +# Like AC_PROG_CC_C_O, but changed for automake. +AC_DEFUN([AM_PROG_CC_C_O], +[AC_REQUIRE([AC_PROG_CC_C_O])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +dnl Make sure AC_PROG_CC is never called again, or it will override our +dnl setting of CC. +m4_define([AC_PROG_CC], + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) +]) +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# gnome-common.m4 -# +# 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. -dnl GNOME_COMMON_INIT +# serial 6 -AC_DEFUN([GNOME_COMMON_INIT], -[ - dnl this macro should come after AC_CONFIG_MACRO_DIR - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) - dnl ensure that when the Automake generated makefile calls aclocal, - dnl it honours the $ACLOCAL_FLAGS environment variable - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - if test -n "$ac_macro_dir"; then - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" - fi - AC_SUBST([ACLOCAL_AMFLAGS]) +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# 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 +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 " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi ]) -AC_DEFUN([GNOME_DEBUG_CHECK], -[ - AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], - [turn on debugging]),, - [enable_debug=no]) +# 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, +# with or without modifications, as long as this notice is preserved. - if test x$enable_debug = xyes ; then - AC_DEFINE(GNOME_ENABLE_DEBUG, 1, - [Enable additional debugging at the expense of performance and size]) - fi +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_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 ]) -dnl GNOME_MAINTAINER_MODE_DEFINES () -dnl define DISABLE_DEPRECATED -dnl -AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], -[ - AC_REQUIRE([AM_MAINTAINER_MODE]) +# Helper functions for option handling. -*- Autoconf -*- - if test $USE_MAINTAINER_MODE = yes; then - DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED" - else - DISABLE_DEPRECATED="" - fi - AC_SUBST(DISABLE_DEPRECATED) -]) +# 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. -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings -dnl For now, only works on GCC -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** +# serial 4 - AC_ARG_ENABLE(compile-warnings, - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - warning_flags= - realsave_CFLAGS="$CFLAGS" +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - case "$enable_compile_warnings" in - no) - warning_flags= - ;; - minimum) - warning_flags="-Wall" - ;; - yes) - warning_flags="-Wall -Wmissing-prototypes" - ;; - maximum|error) - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($warning_flags) +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# 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. - AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) +# serial 5 - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# 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 - WARN_CFLAGS="$warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -]) +# 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` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then -dnl For C++, do basically the same thing. + # If neither matched, then we have a broken ls. This can happen + # 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". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# 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. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) - AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) +# 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. - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac +# serial 2 - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -]) +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. +# Check how to create a tarball. -*- Autoconf -*- -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -AC_PREREQ(2.50) +# serial 2 -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) -]) +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -701,8 +1052,12 @@ # ---------------------------------- 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 +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +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 @@ -715,7 +1070,6 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -724,21 +1078,20 @@ # 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], @@ -746,1035 +1099,758 @@ 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_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $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 -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) -elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl -[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]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES - -# 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, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.3], [], - [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 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.10.3])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 -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 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, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[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])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# 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 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, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -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=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[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 + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG - am_cv_$1_dependencies_compiler_type=none - 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]) +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED - 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 - # 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 - if test "x$enable_dependency_tracking" = xyes; then - continue - else - 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 - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $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 $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 - # 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_$1_dependencies_compiler_type=$depmode - break - fi - fi - done +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) +pkg_failed=no +AC_MSG_CHECKING([for $1]) +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +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 --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# Generate code to set up dependency tracking. -*- Autoconf -*- +$$1_PKG_ERRORS -# 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. +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -#serial 5 +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + 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. -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # 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 -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS +_PKG_TEXT +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 +# +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 +# +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 # -# 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. +# Modified to require ngettext +# Matthias Clasen 08/06/2004 +# +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) -# serial 13 +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. +dnl +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl -# 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. +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# 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.60])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 -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 +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) fi +AC_SUBST($1)dnl +]) -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - 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 + gt_cv_have_gettext=no -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -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. -AC_REQUIRE([AC_PROG_AWK])dnl -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([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_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 -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -]) + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + # + # First check in libc + # + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, + [AC_TRY_LINK([ +#include +], + [return !ngettext ("","", 1)], + gt_cv_func_ngettext_libc=yes, + gt_cv_func_ngettext_libc=no) + ]) + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include +], + [return !dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# 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 - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv)], + :,-liconv) + fi -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi -# Copyright (C) 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. + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) + AC_SUBST(MSGFMT_OPTS) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) -# serial 2 + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering + # We need to process the po/ directory. + POSUB=po -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) -# serial 4 + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.ac. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +glib_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS -# Check to see how 'make' treats includes. -*- Autoconf -*- + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -# Copyright (C) 2001, 2002, 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. + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -# serial 3 + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -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 -# 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 + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) + +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` +else + localedir=`eval echo "${datadir}/locale"` fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) ]) -# Copyright (C) 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 6 +dnl +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_ac,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# gnome-common.m4 # -# 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 +dnl GNOME_COMMON_INIT -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) +AU_DEFUN([GNOME_COMMON_INIT], +[ + dnl this macro should come after AC_CONFIG_MACRO_DIR + AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) + dnl ensure that when the Automake generated makefile calls aclocal, + dnl it honours the $ACLOCAL_FLAGS environment variable + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" + if test -n "$ac_macro_dir"; then + ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" + fi -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# 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 -AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) + AC_SUBST([ACLOCAL_AMFLAGS]) +], +[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}" +in your top-level Makefile.am, instead, where "m4" is the macro directory set +with AC_CONFIG_MACRO_DIR() in your configure.ac]]) -# 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, -# with or without modifications, as long as this notice is preserved. +AC_DEFUN([GNOME_DEBUG_CHECK], +[ + AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], + [turn on debugging]),, + [enable_debug=no]) -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_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 + if test x$enable_debug = xyes ; then + AC_DEFINE(GNOME_ENABLE_DEBUG, 1, + [Enable additional debugging at the expense of performance and size]) + fi ]) -# Helper functions for option handling. -*- Autoconf -*- - -# 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. +dnl GNOME_MAINTAINER_MODE_DEFINES () +dnl define DISABLE_DEPRECATED +dnl +AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +[ + AC_REQUIRE([AM_MAINTAINER_MODE]) -# serial 4 + DISABLE_DEPRECATED="" + if test $USE_MAINTAINER_MODE = yes; then + DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" + for DOMAIN in $DOMAINS; do + DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" + done + fi -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + AC_SUBST(DISABLE_DEPRECATED) +]) -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +dnl GNOME_COMPILE_WARNINGS +dnl Turn on many useful compiler warnings +dnl For now, only works on GCC +AC_DEFUN([GNOME_COMPILE_WARNINGS],[ + dnl ****************************** + dnl More compiler warnings + dnl ****************************** -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + AC_ARG_ENABLE(compile-warnings, + AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], + [Turn on compiler warnings]),, + [enable_compile_warnings="m4_default([$1],[yes])"]) -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + warnCFLAGS= + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi -# Check to make sure that the build environment is sane. -*- Autoconf -*- + warning_flags= + realsave_CFLAGS="$CFLAGS" -# 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. + case "$enable_compile_warnings" in + no) + warning_flags= + ;; + minimum) + warning_flags="-Wall" + ;; + yes) + warning_flags="-Wall -Wmissing-prototypes" + ;; + maximum|error) + warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" + CFLAGS="$warning_flags $CFLAGS" + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + CFLAGS="$SAVE_CFLAGS" + AC_MSG_RESULT($has_option) + if test $has_option = yes; then + warning_flags="$warning_flags $option" + fi + unset has_option + unset SAVE_CFLAGS + done + unset option + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi + ;; + *) + AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) + ;; + esac + CFLAGS="$realsave_CFLAGS" + AC_MSG_CHECKING(what warning flags to pass to the C compiler) + AC_MSG_RESULT($warning_flags) -# serial 4 + AC_ARG_ENABLE(iso-c, + AC_HELP_STRING([--enable-iso-c], + [Try to warn if code is not ISO C ]),, + [enable_iso_c=no]) -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# 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` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + case " $CFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCFLAGS) - # If neither matched, then we have a broken ls. This can happen - # 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". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + WARN_CFLAGS="$warning_flags $complCFLAGS" + AC_SUBST(WARN_CFLAGS) +]) - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) +dnl For C++, do basically the same thing. -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +AC_DEFUN([GNOME_CXX_WARNINGS],[ + AC_ARG_ENABLE(cxx-warnings, + AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] + [Turn on compiler warnings.]),, + [enable_cxx_warnings="m4_default([$1],[minimum])"]) -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# 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. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) + AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) + warnCXXFLAGS= + if test "x$GXX" != xyes; then + enable_cxx_warnings=no + fi + if test "x$enable_cxx_warnings" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) warnCXXFLAGS="-Wall -Wno-unused" ;; + esac -# Copyright (C) 2006 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. + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_cxx_warnings" = "xyes"; then + warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" + fi + fi + fi + AC_MSG_RESULT($warnCXXFLAGS) -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) + AC_ARG_ENABLE(iso-cxx, + AC_HELP_STRING([--enable-iso-cxx], + [Try to warn if code is not ISO C++ ]),, + [enable_iso_cxx=no]) -# Check how to create a tarball. -*- Autoconf -*- + AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) + complCXXFLAGS= + if test "x$enable_iso_cxx" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; + esac -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + case " $CXXFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCXXFLAGS) -# serial 2 + WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" + AC_SUBST(WARN_CXXFLAGS) +]) -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir +AC_PREREQ([2.50]) -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +]) m4_include([m4/gtk-doc.m4]) m4_include([m4/intltool.m4]) diff -Nru libepc-0.3.11/ChangeLog libepc-0.4.2/ChangeLog --- libepc-0.3.11/ChangeLog 2010-03-23 13:06:30.000000000 +0000 +++ libepc-0.4.2/ChangeLog 2011-10-13 14:47:20.000000000 +0000 @@ -1,3 +1,78 @@ + === Release 0.4.2 === + +2011-10-12 Murray Cumming + + Build: examples: Avoiding some repetition. + + * Makefile.am: Used variables to avoid copy/pasting. + +2011-10-12 Murray Cumming + + examples: Fix linker problems. + + * Makefile.am: Some examples used GTK+ but didn't link to it. + USe LIBEPC_UI_LIBS for these. + +2011-08-31 Ionut Biru + + Avoid use of deprecated G_CONST_RETURN + + * libepc/enums.c.in: Avoid use of deprecated G_CONST_RETURN. + Bug #660558 + + === Release 0.4.1 === + +2011-08-31 Murray Cumming + + Really use GTK+ 3. + + * configure.ac: Check for gtk+-3.0 for libepc-ui. + * examples/consumer-ui.c: + * examples/publisher-ui.c: Port to GTK+ 3, though I just removed the + GtkAboutBox url hook. + Bug #657679 (Frederic Peters) + +2011-06-15 Murray Cumming + + Avoid use of deprecated G_CONST_RETURN. + + * libepc-ui/password-dialog.[h|cc]: + * libepc/consumer.[h|cc]: + * libepc/contents.[h|cc]: + * libepc/dispatcher.[h|cc]: + * libepc/protocol.[h|cc]: + * libepc/publisher.[h|cc]: + * libepc/service-info.[h|cc]: + * libepc/service-type.[h|cc]: + * libepc/shell.[h|cc]: Use const instead. + + === Release 0.4.0 === + +2010-05-12 Murray Cumming + + Fix the build with --enable-compiler-warnings=error + + * libepc-ui/progress-window.c + * examples/consumer-ui.c: Remove ifdefed code for older versions + of GTK+. We use GTK+ 3 now anyway. This was causing a compiler + warning about extra tokens after #ifdef. + +2010-05-12 Christopher Dale + + Use avahi-ui-gtk3 rather than avahi-ui-gtk. + Bug #649404 + + This breaks ABI, but this is an unstable library anyway (murrayc). + +2010-03-24 David King + + Fix compilation with GSEAL_ENABLE defined + + * examples/consumer-ui.c: + * libepc-ui/password-dialog.c: + * libepc-ui/progress-window.c: Update for compilation with GSEAL_ENABLE + defined. + === Release 0.3.10 === 2010-03-23 David King @@ -67,13 +142,13 @@ Patch by Petr Salinger. * tests/framework.c (epc_test_list_ifaces): - Use ifr_index if ifr_ifindex does not exist. Fixes build failure + Use ifr_index if ifr_ifindex does not exist. Fixes build failure on GNU/kFreeBSD. Bug #592474. 2009-08-21 Murray Cumming * libepc/shell.c (epc_shell_progress_update_default): - Change the Operation Proceeded string to the more correct Operation in + Change the Operation Proceeded string to the more correct Operation in Progress and added a translator comment, to fix bug #589339. (Luca Ferretti) @@ -81,7 +156,7 @@ 2009-05-18 Murray Cumming - * libepc/shell.c (epc_shell_create_service_browser): Fix a warning about + * libepc/shell.c (epc_shell_create_service_browser): Fix a warning about no return value. Bug #583000 (Vincent Untz). === Release 0.3.9 === @@ -94,8 +169,8 @@ 2008-11-02 Murray Cumming - * libepc/shell.c (epc_shell_create_service_browser): - Return if epc_shell_get_avahi_client() returns a GError, instead of + * libepc/shell.c (epc_shell_create_service_browser): + Return if epc_shell_get_avahi_client() returns a GError, instead of then setting the already-set GError later. 2008-10-23 Mathias Hasselmann @@ -153,8 +228,8 @@ 2008-10-19 Murray Cumming - * Makefile.am: Specify LIBEPC_LIBS for the examples, - because not all (such as gthread-2.0) are implicitly provided + * Makefile.am: Specify LIBEPC_LIBS for the examples, + because not all (such as gthread-2.0) are implicitly provided by the build library. Bug #556689 (Götz Waschk). @@ -173,9 +248,9 @@ 2008-07-29 Murray Cumming - * libepc/publisher.c: epc_publisher_install_handlers(): Check for - a NULL service_name before calling soup_auth_domain_digest_new() to - avoid a crash. However, we need to know why it can be NULL and + * libepc/publisher.c: epc_publisher_install_handlers(): Check for + a NULL service_name before calling soup_auth_domain_digest_new() to + avoid a crash. However, we need to know why it can be NULL and prevent that instead. Bug #540631. @@ -904,21 +979,21 @@ * docs/reference/libepc/libepc-1.0-sections.txt, libepc/shell.c, libepc/shell.h: Remove epc_shell_ref and epc_shell_unref. - * libepc/consumer.c, libepc/dispatcher.c, libepc/publisher.c, + * libepc/consumer.c, libepc/dispatcher.c, libepc/publisher.c, libepc/service-monitor.c, tests/framework.c: Don't call epc_shell_ref and epc_shell_unref. 2007-11-27 Murray Cumming - * libepc/publisher.c: epc_publisher_set_auth_handler() documentation: + * libepc/publisher.c: epc_publisher_set_auth_handler() documentation: Note that this should be used _after_ adding the key. 2007-11-27 Murray Cumming - * libepc/consumer.c: epc_consumer_lookup(): Mention the specific error + * libepc/consumer.c: epc_consumer_lookup(): Mention the specific error code that is relevant when using authentication. * libepc/publisher.c: - * libepc/publisher.h: EpcAuthHandler: mention the two different + * libepc/publisher.h: EpcAuthHandler: mention the two different auth methods (and what to do) in the documentation. EpcAuthFlags: Some minor changes to the documention. @@ -1078,7 +1153,7 @@ 2007-11-22 Murray Cumming - * examples/consumer-ui.c: (main): Rename the transport + * examples/consumer-ui.c: (main): Rename the transport variable to service_type because that is what it is. 2007-11-21 Mathias Hasselmann @@ -2013,4 +2088,3 @@ 2007-10-31 Mathias Hasselmann Initial commit of the Easy Publish and Consume library. - diff -Nru libepc-0.3.11/compile libepc-0.4.2/compile --- libepc-0.3.11/compile 2010-03-23 13:08:19.000000000 +0000 +++ libepc-0.4.2/compile 2011-10-13 14:51:55.000000000 +0000 @@ -18,8 +18,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 diff -Nru libepc-0.3.11/config.guess libepc-0.4.2/config.guess --- libepc-0.3.11/config.guess 2010-03-23 13:08:19.000000000 +0000 +++ libepc-0.4.2/config.guess 2011-10-13 14:51:55.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2009-08-19' +timestamp='2011-05-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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." @@ -139,25 +140,6 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in -Linux|GNU/*) - eval $set_cc_for_build - cat << EOF > $dummy.c - #include - #ifdef __UCLIBC__ - # ifdef __UCLIBC_CONFIG_VERSION__ - LIBC=uclibc __UCLIBC_CONFIG_VERSION__ - # else - LIBC=uclibc - # endif - #else - LIBC=gnu - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` - ;; -esac - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -199,7 +181,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -242,7 +224,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -288,7 +270,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -314,7 +299,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -352,6 +337,9 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -410,23 +398,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -496,8 +484,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -510,7 +498,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -567,7 +555,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -610,52 +598,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -746,22 +734,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -785,14 +773,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -820,18 +808,18 @@ echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in + *:Interix*:*) + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -868,41 +856,72 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-${LIBC} + echo cris-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-${LIBC} + echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-${LIBC} + echo frv-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -920,125 +939,56 @@ #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-${LIBC}"; exit; } + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-${LIBC} - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo or32-unknown-linux-gnu exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-gnu + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-${LIBC} + echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" - ;; - esac - # This should get integrated into the C code below, but now we hack - if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1046,11 +996,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1082,7 +1032,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1110,13 +1060,13 @@ exit ;; 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 i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # 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 ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1151,8 +1101,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /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 \ @@ -1195,10 +1145,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1224,11 +1174,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1268,6 +1218,16 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1283,6 +1243,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1328,13 +1291,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1374,11 +1337,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru libepc-0.3.11/config.h.in libepc-0.4.2/config.h.in --- libepc-0.3.11/config.h.in 2010-03-23 13:08:18.000000000 +0000 +++ libepc-0.4.2/config.h.in 2011-10-13 14:51:54.000000000 +0000 @@ -76,6 +76,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 libepc-0.3.11/config.sub libepc-0.4.2/config.sub --- libepc-0.3.11/config.sub 2010-03-23 13:08:19.000000000 +0000 +++ libepc-0.4.2/config.sub 2011-10-13 14:51:55.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, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2009-08-19' +timestamp='2011-03-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -75,8 +75,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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." @@ -123,8 +124,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | 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 @@ -156,8 +158,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +175,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -251,7 +253,7 @@ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx | dvp \ + | d10v | d30v | dlx | dsp16xx \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ @@ -281,26 +283,39 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -311,6 +326,18 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -331,7 +358,7 @@ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -365,24 +392,28 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* \ + | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile-* | tilegx-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -407,7 +438,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -477,11 +508,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -513,7 +553,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -729,7 +769,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -747,24 +787,6 @@ basic_machine=m68k-atari os=-mint ;; - mipsEE* | ee | ps2) - basic_machine=mips64r5900el-scei - case $os in - -linux*) - ;; - *) - os=-elf - ;; - esac - ;; - iop) - basic_machine=mipsel-scei - os=-irx - ;; - dvp) - basic_machine=dvp-scei - os=-elf - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -854,6 +876,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -936,9 +964,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1032,6 +1061,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1088,17 +1120,10 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu ;; tile*) basic_machine=tile-unknown @@ -1171,6 +1196,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1268,9 +1296,12 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1292,8 +1323,8 @@ # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1306,7 +1337,8 @@ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1314,7 +1346,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1353,7 +1385,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1402,7 +1434,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1447,6 +1479,8 @@ -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1469,10 +1503,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1484,8 +1518,17 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1512,7 +1555,7 @@ m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1539,7 +1582,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru libepc-0.3.11/configure libepc-0.4.2/configure --- libepc-0.3.11/configure 2010-03-23 13:08:18.000000000 +0000 +++ libepc-0.4.2/configure 2011-10-13 14:51:54.000000000 +0000 @@ -1,20 +1,24 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for libepc 0.3.11. +# Generated by GNU Autoconf 2.68 for libepc 0.4.2. # # Report bugs to . # +# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 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=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -22,23 +26,15 @@ 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 - as_nl=' ' export as_nl @@ -46,7 +42,13 @@ 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 -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# 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 @@ -57,7 +59,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -80,13 +82,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -96,15 +91,16 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +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 ;; @@ -116,12 +112,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + 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='> ' @@ -133,330 +133,316 @@ LANGUAGE=C export LANGUAGE -# 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 - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -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'` - # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + 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 - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - 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 -} +" + 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 -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 - : +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 -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -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 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false 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 + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # 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 - 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=: - # 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 - - -: -_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=: - # 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_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. + 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. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. + 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 and +$0: https://bugzilla.gnome.org/enter_bug.cgi?product=libepc +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." + fi + exit 1 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 +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 - 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 +## --------------------- ## +## 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 - 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 +# 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" -fi -fi +} # 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 -(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 -} +# 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 -exitcode=0 -if as_func_success; then - : +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} +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'` +# 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 - 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. :-) + 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/= @@ -473,8 +459,7 @@ 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 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_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 @@ -484,29 +469,18 @@ 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 +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; 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 @@ -536,7 +510,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -555,10 +529,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -571,161 +545,14 @@ # Sed expression to map a string onto a valid variable name. as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - -# Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -$* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - -exec 7<&0 &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` @@ -740,14 +567,14 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libepc' PACKAGE_TARNAME='libepc' -PACKAGE_VERSION='0.3.11' -PACKAGE_STRING='libepc 0.3.11' +PACKAGE_VERSION='0.4.2' +PACKAGE_STRING='libepc 0.4.2' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=libepc' +PACKAGE_URL='http://live.gnome.org/libepc' # Factoring default headers for most tests. ac_includes_default="\ @@ -785,7 +612,9 @@ # include #endif" -ac_subst_vars='LTLIBOBJS +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS LIBOBJS LIBEPC_UI_LIBS LIBEPC_UI_CFLAGS @@ -807,13 +636,25 @@ CATOBJEXT CATALOGS MSGFMT_OPTS +GTK_DOC_USE_REBASE_FALSE +GTK_DOC_USE_REBASE_TRUE GTK_DOC_USE_LIBTOOL_FALSE GTK_DOC_USE_LIBTOOL_TRUE +GTK_DOC_BUILD_PDF_FALSE +GTK_DOC_BUILD_PDF_TRUE +GTK_DOC_BUILD_HTML_FALSE +GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +GTKDOC_DEPS_LIBS +GTKDOC_DEPS_CFLAGS +HTML_DIR +GTKDOC_MKPDF +GTKDOC_REBASE GTKDOC_CHECK +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG -HTML_DIR DATADIRNAME ALL_LINGUAS INTLTOOL_PERL @@ -850,9 +691,11 @@ LIPO NMEDIT DSYMUTIL -lt_ECHO +MANIFEST_TOOL RANLIB +ac_ct_AR AR +DLLTOOL OBJDUMP LN_S NM @@ -949,6 +792,7 @@ program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -968,10 +812,13 @@ with_pic enable_fast_install with_gnu_ld +with_sysroot enable_libtool_lock enable_nls with_html_dir enable_gtk_doc +enable_gtk_doc_html +enable_gtk_doc_pdf ' ac_precious_vars='build_alias host_alias @@ -984,6 +831,10 @@ CPPFLAGS CPP PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR +GTKDOC_DEPS_CFLAGS +GTKDOC_DEPS_LIBS AVAHI_UI_CFLAGS AVAHI_UI_LIBS LIBEPC_CFLAGS @@ -1052,8 +903,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. @@ -1098,8 +950,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + 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 @@ -1125,8 +976,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + 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 @@ -1330,8 +1180,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + 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 @@ -1347,8 +1196,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + 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 @@ -1378,17 +1226,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_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 && - { $as_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 ;; @@ -1397,7 +1245,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1405,15 +1253,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1436,8 +1282,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_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' @@ -1451,8 +1296,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1467,11 +1312,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_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" || - { $as_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. @@ -1510,13 +1353,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_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" || { $as_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 @@ -1542,7 +1383,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libepc 0.3.11 to adapt to many kinds of systems. +\`configure' configures libepc 0.4.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1556,7 +1397,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 @@ -1612,7 +1453,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libepc 0.3.11:";; + short | recursive ) echo "Configuration of libepc 0.4.2:";; esac cat <<\_ACEOF @@ -1633,7 +1474,9 @@ optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --disable-nls do not use Native Language Support - --enable-gtk-doc use gtk-doc to build documentation [default=no] + --enable-gtk-doc use gtk-doc to build documentation [[default=no]] + --enable-gtk-doc-html build documentation in html format [[default=yes]] + --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1641,6 +1484,8 @@ --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). --with-html-dir=PATH path to installed docs Some influential environment variables: @@ -1651,10 +1496,18 @@ 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 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 + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS + linker flags for GTKDOC_DEPS, overriding pkg-config AVAHI_UI_CFLAGS C compiler flags for AVAHI_UI, overriding pkg-config AVAHI_UI_LIBS @@ -1671,6 +1524,7 @@ it to find libraries and programs with nonstandard names/locations. Report bugs to . +libepc home page: . _ACEOF ac_status=$? fi @@ -1699,56 +1553,464 @@ # for backward compatibility: ac_top_builddir=$ac_top_build_prefix -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 ;; +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 + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +libepc configure 0.4.2 +generated by GNU Autoconf 2.68 + +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 + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + 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 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# 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; ${as_lineno_stack:+:} 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 \${$3+:} false; 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; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# 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 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# 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; ${as_lineno_stack:+:} 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 \${$3+:} false; 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; ${as_lineno_stack:+:} 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 \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; 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;} +( $as_echo "## ---------------------------------------------------------------------- ## +## Report this to https://bugzilla.gnome.org/enter_bug.cgi?product=libepc ## +## ---------------------------------------------------------------------- ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; 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; ${as_lineno_stack:+:} unset as_lineno -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -libepc configure 0.3.11 -generated by GNU Autoconf 2.63 +} # ac_fn_c_check_header_mongrel -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. +# ac_fn_c_find_uintX_t LINENO BITS VAR +# ------------------------------------ +# Finds an unsigned integer type with width BITS, setting cache variable VAR +# accordingly. +ac_fn_c_find_uintX_t () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 +$as_echo_n "checking for uint$2_t... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + # Order is important - never check a type that is potentially smaller + # than half of the expected target width. + for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \ + 'unsigned long long int' 'unsigned short int' 'unsigned char'; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF - exit +if ac_fn_c_try_compile "$LINENO"; then : + case $ac_type in #( + uint$2_t) : + eval "$3=yes" ;; #( + *) : + eval "$3=\$ac_type" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if eval test \"x\$"$3"\" = x"no"; then : + +else + break fi + done +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; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_find_uintX_t 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 libepc $as_me 0.3.11, which was -generated by GNU Autoconf 2.63. Invocation command line was +It was created by libepc $as_me 0.4.2, which was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -1784,8 +2046,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1822,9 +2084,9 @@ 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 @@ -1840,13 +2102,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 @@ -1858,11 +2120,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1871,13 +2131,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_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= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1896,11 +2156,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1913,11 +2171,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -1931,11 +2187,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -1949,46 +2203,53 @@ 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 an explicitly selected file to automatically selected ones. ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -1999,19 +2260,23 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + 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 - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 + # 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";; @@ -2019,7 +2284,7 @@ esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -2034,11 +2299,11 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $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) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $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=: ;; ,);; @@ -2048,17 +2313,17 @@ 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:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $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:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $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:$LINENO: former value: \`$ac_old_val'" >&5 + { $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:$LINENO: current value: \`$ac_new_val'" >&5 + { $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 @@ -2070,43 +2335,20 @@ 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 - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $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:$LINENO: error: changes in the environment can compromise the build" >&5 + { $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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + 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' @@ -2115,7 +2357,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.10' +am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2134,9 +2376,7 @@ fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2162,10 +2402,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2173,11 +2413,11 @@ 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. @@ -2214,7 +2454,7 @@ ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2230,7 +2470,7 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $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}. @@ -2241,21 +2481,34 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $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" \ @@ -2265,11 +2518,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". - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_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 @@ -2278,13 +2528,10 @@ # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_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 -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $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" @@ -2299,17 +2546,31 @@ # 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= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 + { $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 -install_sh=${install_sh-"\$(SHELL) $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 # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -2319,9 +2580,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2332,24 +2593,24 @@ 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" - $as_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 STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2359,9 +2620,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2372,24 +2633,24 @@ 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" - $as_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_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2398,7 +2659,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -2411,10 +2672,10 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2422,7 +2683,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + 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 #( @@ -2434,11 +2695,12 @@ esac done 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 @@ -2446,11 +2708,10 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" @@ -2463,9 +2724,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2476,24 +2737,24 @@ 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" - $as_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 AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2501,11 +2762,11 @@ test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2513,7 +2774,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2523,11 +2784,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2547,9 +2808,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2565,7 +2824,7 @@ # Define the identity of the package. PACKAGE='libepc' - VERSION='0.3.11' + VERSION='0.4.2' # Some tools Automake needs. @@ -2608,44 +2867,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. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $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 -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $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 @@ -2670,9 +2929,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2683,24 +2942,24 @@ 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" - $as_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 - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2710,9 +2969,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2723,24 +2982,24 @@ 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" - $as_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 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2749,7 +3008,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -2763,9 +3022,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2776,24 +3035,24 @@ 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" - $as_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 - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2803,9 +3062,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2817,18 +3076,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" - $as_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 @@ -2847,10 +3106,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2862,9 +3121,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2875,24 +3134,24 @@ 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" - $as_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 - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2906,9 +3165,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2919,24 +3178,24 @@ 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" - $as_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 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2949,7 +3208,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -2960,57 +3219,37 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +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_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } +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=$? + 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 @@ -3026,8 +3265,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -3043,17 +3282,17 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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=$? - $as_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, @@ -3070,7 +3309,7 @@ # 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 @@ -3089,84 +3328,41 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +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:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $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:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_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 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_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 -$as_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 -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $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" +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:$LINENO: $ac_try_echo\"" -$as_echo "$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=$? - $as_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 @@ -3181,32 +3377,83 @@ esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&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 $? "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 +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 +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_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +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_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else - cat >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 @@ -3218,17 +3465,17 @@ } _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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=$? - $as_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 @@ -3241,31 +3488,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $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:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +{ $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 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - cat >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 @@ -3279,37 +3518,16 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $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 @@ -3318,20 +3536,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag 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 @@ -3342,35 +3556,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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 @@ -3381,36 +3571,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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 @@ -3421,42 +3587,17 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $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 @@ -3473,18 +3614,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no 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 @@ -3541,32 +3678,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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 @@ -3577,17 +3691,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $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' @@ -3597,9 +3713,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3707,7 +3823,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $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 @@ -3726,7 +3842,7 @@ # Check whether --enable-compile-warnings was given. -if test "${enable_compile_warnings+set}" = set; then +if test "${enable_compile_warnings+set}" = set; then : enableval=$enable_compile_warnings; else enable_compile_warnings="maximum" @@ -3757,13 +3873,9 @@ for option in -Wno-sign-compare; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" - { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 $as_echo_n "checking whether gcc understands $option... " >&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. */ int @@ -3774,35 +3886,14 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 : has_option=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - has_option=no + has_option=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$SAVE_CFLAGS" - { $as_echo "$as_me:$LINENO: result: $has_option" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 $as_echo "$has_option" >&6; } if test $has_option = yes; then warning_flags="$warning_flags $option" @@ -3816,26 +3907,24 @@ fi ;; *) - { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 -$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 ;; esac CFLAGS="$realsave_CFLAGS" - { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } - { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5 $as_echo "$warning_flags" >&6; } # Check whether --enable-iso-c was given. -if test "${enable_iso_c+set}" = set; then +if test "${enable_iso_c+set}" = set; then : enableval=$enable_iso_c; else enable_iso_c=no fi - { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5 $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } complCFLAGS= if test "x$enable_iso_c" != "xno"; then @@ -3850,22 +3939,23 @@ esac fi fi - { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5 $as_echo "$complCFLAGS" >&6; } WARN_CFLAGS="$warning_flags $complCFLAGS" -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then +if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= @@ -3881,15 +3971,18 @@ + DISABLE_DEPRECATED="" if test $USE_MAINTAINER_MODE = yes; then - DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED" - else - DISABLE_DEPRECATED="" + DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" + for DOMAIN in $DOMAINS; do + DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" + done fi -LT_VERSION_INFO="2:0:0" + +LT_VERSION_INFO="3:0:0" GETTEXT_PACKAGE=libepc @@ -3908,9 +4001,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3921,24 +4014,24 @@ 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" - $as_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 - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3948,9 +4041,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3961,24 +4054,24 @@ 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" - $as_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 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3987,7 +4080,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -4001,9 +4094,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4014,24 +4107,24 @@ 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" - $as_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 - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4041,9 +4134,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4055,18 +4148,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" - $as_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 @@ -4085,10 +4178,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4100,9 +4193,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4113,24 +4206,24 @@ 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" - $as_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 - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4144,9 +4237,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4157,24 +4250,24 @@ 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" - $as_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 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4187,7 +4280,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -4198,62 +4291,42 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +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_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } +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=$? + 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 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - cat >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 @@ -4267,37 +4340,16 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $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 @@ -4306,20 +4358,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag 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 @@ -4330,35 +4378,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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 @@ -4369,36 +4393,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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 @@ -4409,42 +4409,17 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $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 @@ -4461,18 +4436,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no 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 @@ -4529,32 +4500,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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 @@ -4565,17 +4513,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $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' @@ -4585,9 +4535,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4695,7 +4645,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $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 @@ -4711,22 +4661,18 @@ if test "x$CC" != xcc; then - { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } else - { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 $as_echo_n "checking whether cc understands -c and -o together... " >&6; } fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; 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 @@ -4742,63 +4688,63 @@ # existing .o file with -o, though they will create one. ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* -if { (case "(($ac_try" in +if { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (case "(($ac_try" in + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. if { ac_try='cc -c conftest.$ac_ext >&5' - { (case "(($ac_try" in + { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* - if { (case "(($ac_try" in + if { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (case "(($ac_try" in + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # cc works too. : @@ -4815,15 +4761,13 @@ fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -cat >>confdefs.h <<\_ACEOF -#define NO_MINUS_C_MINUS_O 1 -_ACEOF +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h fi @@ -4845,14 +4789,14 @@ case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + { $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 -macro_version='2.2.6b' -macro_revision='1.3017' +macro_version='2.4' +macro_revision='1.3293' @@ -4870,35 +4814,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_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` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_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='-' @@ -4914,46 +4850,111 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -4961,7 +4962,7 @@ ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - $as_unset ac_script || ac_script= + { 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 @@ -4970,7 +4971,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + 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 @@ -4990,7 +4991,7 @@ $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 - ac_count=`expr $ac_count + 1` + 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" @@ -5005,19 +5006,17 @@ $ac_path_SED_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +{ $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 @@ -5035,9 +5034,9 @@ -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -5048,7 +5047,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + 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 @@ -5068,7 +5067,7 @@ $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" @@ -5083,26 +5082,24 @@ $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + 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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $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" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -5116,7 +5113,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + 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 @@ -5136,7 +5133,7 @@ $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" @@ -5151,12 +5148,10 @@ $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + 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 @@ -5164,14 +5159,14 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $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:$LINENO: checking for fgrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -5185,7 +5180,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + 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 @@ -5205,7 +5200,7 @@ $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 - ac_count=`expr $ac_count + 1` + 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" @@ -5220,12 +5215,10 @@ $ac_path_FGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + 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 @@ -5233,7 +5226,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 +{ $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" @@ -5259,7 +5252,7 @@ # 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 @@ -5268,7 +5261,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $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*) @@ -5298,13 +5291,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -5335,18 +5328,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -5359,7 +5350,7 @@ ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +{ $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 @@ -5371,9 +5362,9 @@ -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -5420,20 +5411,23 @@ : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +{ $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" + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then +if ${ac_cv_prog_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -5444,24 +5438,24 @@ 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_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_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 DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 $as_echo "$DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5471,13 +5465,13 @@ fi if test -z "$DUMPBIN"; then ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -5488,24 +5482,24 @@ 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_DUMPBIN="$ac_prog" - $as_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_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 $as_echo "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5518,7 +5512,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -5526,6 +5520,15 @@ fi fi + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -5538,44 +5541,44 @@ -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then +if ${lt_cv_nm_interface+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5548: $ac_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5551: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5554: output\"" >&5) + (eval echo "\"\$as_me:$LINENO: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 $as_echo "$lt_cv_nm_interface" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +{ $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:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 $as_echo "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 @@ -5608,6 +5611,11 @@ lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -5672,8 +5680,8 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -5693,10 +5701,10 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 + { $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:$LINENO: result: none" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -5710,27 +5718,27 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 +{ $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,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 $as_echo "$xsi_shell" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 +{ $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:$LINENO: result: $lt_shell_append" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 $as_echo "$lt_shell_append" >&6; } @@ -5765,14 +5773,88 @@ -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then +if ${lt_cv_ld_reload_flag+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +{ $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 @@ -5781,6 +5863,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -5801,9 +5888,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -5814,24 +5901,24 @@ 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_OBJDUMP="${ac_tool_prefix}objdump" - $as_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 OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 $as_echo "$OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5841,9 +5928,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -5854,24 +5941,24 @@ 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_OBJDUMP="objdump" - $as_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_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 $as_echo "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5880,7 +5967,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -5900,9 +5987,9 @@ -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then +if ${lt_cv_deplibs_check_method+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -5944,16 +6031,18 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -5983,6 +6072,10 @@ lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -5991,11 +6084,11 @@ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -6017,11 +6110,11 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +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 @@ -6096,8 +6189,23 @@ esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -6113,12 +6221,165 @@ + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -6129,36 +6390,40 @@ 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 $as_echo "$AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + test -n "$AR" && break + done fi -if test -z "$ac_cv_prog_AR"; then +if test -z "$AR"; then ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -6169,44 +6434,46 @@ 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi 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 - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 $as_echo "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then AR="false" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 fi -else - AR="$ac_cv_prog_AR" fi -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} @@ -6218,12 +6485,70 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + + + + 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -6234,24 +6559,24 @@ 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" - $as_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 STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6261,9 +6586,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -6274,24 +6599,24 @@ 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" - $as_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_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6300,7 +6625,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -6320,9 +6645,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -6333,24 +6658,24 @@ 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" - $as_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 RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6360,9 +6685,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -6373,24 +6698,24 @@ 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" - $as_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_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 $as_echo "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6399,7 +6724,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -6433,6 +6758,18 @@ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + @@ -6477,9 +6814,9 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6540,8 +6877,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6577,6 +6914,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -6595,18 +6933,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _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=$? - $as_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 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:$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" @@ -6618,6 +6956,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -6629,7 +6979,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT_DLSYM_CONST struct { const char *name; void *address; } @@ -6655,19 +7005,19 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_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" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -6697,13 +7047,28 @@ 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 - { $as_echo "$as_me:$LINENO: result: failed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 $as_echo "failed" >&6; } else - { $as_echo "$as_me:$LINENO: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + + + + + + @@ -6722,11 +7087,45 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -6738,11 +7137,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - 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=$? - $as_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 case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" @@ -6756,12 +7155,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6759 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_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 test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -6795,11 +7194,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - 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=$? - $as_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 case `/usr/bin/file conftest.o` in *32-bit*) case $host in @@ -6848,9 +7247,9 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then +if ${lt_cv_cc_needs_belf+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -6859,11 +7258,7 @@ 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6874,38 +7269,13 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi - -rm -rf conftest.dSYM -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 ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6913,7 +7283,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +{ $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 @@ -6923,11 +7293,11 @@ sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - 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=$? - $as_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 case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in @@ -6947,15 +7317,132 @@ need_locks="$enable_libtool_lock" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then +if ${ac_cv_prog_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -6966,24 +7453,24 @@ 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" - $as_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 DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 $as_echo "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6993,9 +7480,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -7006,24 +7493,24 @@ 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" - $as_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_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 $as_echo "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7032,7 +7519,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -7045,9 +7532,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then +if ${ac_cv_prog_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -7058,24 +7545,24 @@ 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" - $as_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 NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 $as_echo "$NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7085,9 +7572,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -7098,24 +7585,24 @@ 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" - $as_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_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 $as_echo "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7124,7 +7611,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -7137,9 +7624,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then +if ${ac_cv_prog_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -7150,24 +7637,24 @@ 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_LIPO="${ac_tool_prefix}lipo" - $as_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 LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 $as_echo "$LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7177,9 +7664,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -7190,24 +7677,24 @@ 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_LIPO="lipo" - $as_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_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 $as_echo "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7216,7 +7703,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -7229,9 +7716,9 @@ if test -n "$ac_tool_prefix"; then # 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then +if ${ac_cv_prog_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -7242,24 +7729,24 @@ 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_OTOOL="${ac_tool_prefix}otool" - $as_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 OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 $as_echo "$OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7269,9 +7756,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -7282,24 +7769,24 @@ 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_OTOOL="otool" - $as_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_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 $as_echo "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7308,7 +7795,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -7321,9 +7808,9 @@ if test -n "$ac_tool_prefix"; then # 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then +if ${ac_cv_prog_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -7334,24 +7821,24 @@ 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_OTOOL64="${ac_tool_prefix}otool64" - $as_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 OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 $as_echo "$OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7361,9 +7848,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -7374,24 +7861,24 @@ 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_OTOOL64="otool64" - $as_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_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 $as_echo "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7400,7 +7887,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -7436,9 +7923,9 @@ - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then +if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -7463,22 +7950,18 @@ rm -f conftest.* fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +{ $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:$LINENO: checking for -exported_symbols_list linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +if ${lt_cv_ld_exported_symbols_list+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no 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 @@ -7489,43 +7972,50 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes else - $as_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 -rf conftest.dSYM -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 LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -7553,7 +8043,7 @@ else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7566,14 +8056,14 @@ 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 -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +{ $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 + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -7588,11 +8078,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 @@ -7601,78 +8087,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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 @@ -7684,7 +8126,7 @@ else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $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 @@ -7695,11 +8137,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 @@ -7708,87 +8146,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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $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:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -7798,16 +8189,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else - cat >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 @@ -7822,48 +8209,23 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + 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 + 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 - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7873,18 +8235,14 @@ 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 + 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 - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7894,14 +8252,10 @@ 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 + if test "$cross_compiling" = yes; then : : 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. */ #include #include @@ -7928,118 +8282,33 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -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 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $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 -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h 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` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 - -#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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +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 @@ -8049,62 +8318,13 @@ done - for ac_header in dlfcn.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 - -#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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +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" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_DLFCN_H 1 _ACEOF fi @@ -8113,10 +8333,12 @@ + + # Set options enable_dlopen=yes # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -8152,7 +8374,7 @@ # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -8185,7 +8407,7 @@ # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then +if test "${with_pic+set}" = set; then : withval=$with_pic; pic_mode="$withval" else pic_mode=default @@ -8201,7 +8423,7 @@ # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -8263,6 +8485,7 @@ + test -z "$LN_S" && LN_S="ln -s" @@ -8282,9 +8505,9 @@ setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:$LINENO: checking for objdir" >&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 +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -8297,7 +8520,7 @@ fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -8312,19 +8535,6 @@ - - - - - - - - - - - - - case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some @@ -8337,23 +8547,6 @@ ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -8382,7 +8575,7 @@ *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it @@ -8390,9 +8583,9 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8443,10 +8636,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8456,9 +8649,9 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:$LINENO: checking for file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8509,10 +8702,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8591,11 +8784,16 @@ lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac - { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -8611,15 +8809,15 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8614: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8618: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes @@ -8628,7 +8826,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +{ $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 @@ -8648,8 +8846,6 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -8697,6 +8893,12 @@ lt_prog_compiler_pic='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -8739,6 +8941,13 @@ lt_prog_compiler_pic='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + lt_prog_compiler_pic='-Xcompiler -fPIC' + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -8780,7 +8989,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -8801,7 +9010,13 @@ lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' @@ -8813,25 +9028,25 @@ # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-qpic' lt_prog_compiler_static='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 + *Sun\ F* | *Sun*Fortran*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_wl='' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker + *Sun\ C*) + # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' + lt_prog_compiler_wl='-Wl,' ;; esac ;; @@ -8863,7 +9078,7 @@ lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; @@ -8920,21 +9135,25 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -8950,15 +9169,15 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8953: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8957: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes @@ -8967,7 +9186,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +{ $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" = xyes; then @@ -8987,13 +9206,18 @@ + + + + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then +if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -9006,7 +9230,7 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes @@ -9019,7 +9243,7 @@ LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +{ $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" = xyes; then @@ -9034,9 +9258,9 @@ - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9055,16 +9279,16 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9058: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9062: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9081,7 +9305,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -9089,9 +9313,9 @@ - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9110,16 +9334,16 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9113: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9117: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9136,7 +9360,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -9145,7 +9369,7 @@ 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 - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $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* @@ -9153,10 +9377,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $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 @@ -9169,7 +9393,7 @@ - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $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= @@ -9229,10 +9453,39 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -9250,6 +9503,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -9265,11 +9519,12 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -9305,10 +9560,12 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -9326,6 +9583,11 @@ fi ;; + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no @@ -9341,7 +9603,7 @@ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -9351,15 +9613,16 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9370,13 +9633,17 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -9392,17 +9659,17 @@ fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9411,13 +9678,13 @@ fi ;; - netbsd*) + 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' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9435,8 +9702,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9482,8 +9749,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9523,8 +9790,10 @@ else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -9586,6 +9855,7 @@ 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 @@ -9611,11 +9881,13 @@ 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 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9626,54 +9898,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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -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 + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' @@ -9682,11 +9934,13 @@ 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 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9697,59 +9951,44 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -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 + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -9781,20 +10020,63 @@ # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac ;; darwin* | rhapsody*) @@ -9804,7 +10086,11 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else + whole_archive_flag_spec='' + fi link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" case $cc_basename in @@ -9812,7 +10098,7 @@ *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -9855,7 +10141,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -9863,7 +10149,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -9878,8 +10164,8 @@ ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -9897,16 +10183,16 @@ ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -9918,7 +10204,46 @@ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + ;; esac fi @@ -9946,52 +10271,39 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF -int foo(void) {} + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; 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' - +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + lt_cv_irix_exported_symbol=no fi - -rm -rf conftest.dSYM -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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -10000,7 +10312,7 @@ link_all_deplibs=yes ;; - netbsd*) + 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 @@ -10053,17 +10365,17 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -10073,13 +10385,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -10092,9 +10404,9 @@ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -10243,7 +10555,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no @@ -10280,46 +10592,52 @@ # 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:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$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 + $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:$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* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -$as_echo "$archive_cmds_need_lc" >&6; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac fi @@ -10482,7 +10800,7 @@ - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $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 @@ -10490,16 +10808,23 @@ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -10512,7 +10837,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; @@ -10532,7 +10857,13 @@ if (lt_foo != "") { lt_freq[lt_foo]++; } if (lt_freq[lt_foo] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -10620,7 +10951,7 @@ m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -10651,8 +10982,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -10673,36 +11005,83 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -10746,14 +11125,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + 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}' @@ -10764,12 +11136,6 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -10799,6 +11165,20 @@ 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 + ;; + +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -10844,8 +11224,10 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) @@ -10903,7 +11285,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 @@ -10912,16 +11294,17 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -10932,43 +11315,19 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -10977,7 +11336,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -10990,6 +11349,18 @@ 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 @@ -11178,7 +11549,7 @@ dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -11280,7 +11651,12 @@ - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + + + + + + { $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" || @@ -11305,7 +11681,7 @@ # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || @@ -11350,18 +11726,14 @@ darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -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. */ /* Override any GCC internal prototype to avoid an error. @@ -11379,43 +11751,18 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -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 LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -11428,189 +11775,19 @@ ;; *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+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. */ -/* 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen="shl_load" else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 + { $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 >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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dld_shl_load=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no -fi - -rm -rf conftest.dSYM -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 -{ $as_echo "$as_me:$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 - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then +if ${ac_cv_lib_dld_shl_load+:} false; 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="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 @@ -11618,72 +11795,41 @@ #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 - +char shl_load (); int main () { -return dlopen (); +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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no + ac_cv_lib_dld_shl_load=no fi - -rm -rf conftest.dSYM -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 +LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then +{ $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" = xyes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -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. */ /* Override any GCC internal prototype to avoid an error. @@ -11701,57 +11847,28 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -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 LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -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. */ /* Override any GCC internal prototype to avoid an error. @@ -11769,57 +11886,28 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_svld_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi - -rm -rf conftest.dSYM -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 LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -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. */ /* Override any GCC internal prototype to avoid an error. @@ -11837,43 +11925,18 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_dld_link=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi - -rm -rf conftest.dSYM -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 LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -11912,9 +11975,9 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then +if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -11923,7 +11986,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11926 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11964,7 +12027,13 @@ # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -11973,7 +12042,11 @@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -11982,11 +12055,11 @@ return status; } _LT_EOF - 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=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $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 @@ -12003,14 +12076,14 @@ fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +{ $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:$LINENO: checking whether a statically linked program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then +if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -12019,7 +12092,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12022 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12060,7 +12133,13 @@ # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -12069,7 +12148,11 @@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -12078,11 +12161,11 @@ return status; } _LT_EOF - 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=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $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 @@ -12099,7 +12182,7 @@ fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 $as_echo "$lt_cv_dlopen_self_static" >&6; } fi @@ -12138,12 +12221,12 @@ striplib= old_striplib= -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +{ $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:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough @@ -12152,15 +12235,15 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi ;; *) - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ;; esac @@ -12178,12 +12261,12 @@ # Report which library types will actually be built - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 + { $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:$LINENO: result: $can_build_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 $as_echo "$can_build_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 + { $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 @@ -12204,14 +12287,14 @@ fi ;; esac - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 $as_echo "$enable_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 + { $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:$LINENO: result: $enable_static" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -12247,16 +12330,16 @@ - { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then +if test "${enable_nls+set}" = set; then : enableval=$enable_nls; USE_NLS=$enableval else USE_NLS=yes fi - { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 $as_echo "$USE_NLS" >&6; } @@ -12264,35 +12347,31 @@ case "$am__api_version" in 1.01234) - { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 -$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; esac if test -n "0.35.0"; then - { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 $as_echo_n "checking for intltool >= 0.35.0... " >&6; } INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5 -$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_INTLTOOL_UPDATE+set}" = set; then +if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in @@ -12305,14 +12384,14 @@ 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_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -12320,19 +12399,19 @@ fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 $as_echo "$INTLTOOL_UPDATE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "intltool-merge", so it can be a program name with args. set dummy intltool-merge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_INTLTOOL_MERGE+set}" = set; then +if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in @@ -12345,14 +12424,14 @@ 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_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -12360,19 +12439,19 @@ fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 $as_echo "$INTLTOOL_MERGE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "intltool-extract", so it can be a program name with args. set dummy intltool-extract; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_INTLTOOL_EXTRACT+set}" = set; then +if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in @@ -12385,14 +12464,14 @@ 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_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -12400,18 +12479,16 @@ fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 $as_echo "$INTLTOOL_EXTRACT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 -$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -12454,12 +12531,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_XGETTEXT+set}" = set; then +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case $XGETTEXT in @@ -12472,14 +12625,14 @@ 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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -12487,19 +12640,19 @@ fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 $as_echo "$XGETTEXT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_MSGMERGE+set}" = set; then +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGMERGE in @@ -12512,14 +12665,14 @@ 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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -12527,19 +12680,19 @@ fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 $as_echo "$MSGMERGE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_MSGFMT+set}" = set; then +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGFMT in @@ -12552,14 +12705,14 @@ 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_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -12567,19 +12720,19 @@ fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 $as_echo "$MSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_GMSGFMT+set}" = set; then +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -12592,14 +12745,14 @@ 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_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 test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -12608,33 +12761,29 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 $as_echo "$GMSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_INTLTOOL_PERL+set}" = set; then +if ${ac_cv_path_INTLTOOL_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in @@ -12647,188 +12796,78 @@ 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_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; esac fi -INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL -if test -n "$INTLTOOL_PERL"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 -$as_echo "$INTLTOOL_PERL" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test -z "$INTLTOOL_PERL"; then - { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 -$as_echo "$as_me: error: perl not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 -$as_echo "$as_me: error: perl 5.x required for intltool" >&2;} - { (exit 1); exit 1; }; } -fi -if test "x" != "xno-xml"; then - { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 -$as_echo_n "checking for XML::Parser... " >&6; } - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { $as_echo "$as_me:$LINENO: result: ok" >&5 -$as_echo "ok" >&6; } - else - { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 -$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} - { (exit 1); exit 1; }; } - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile - - -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - DATADIRNAME=share -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in - *-*-solaris*) - { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - $as_echo_n "(cached) " >&6 +INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL +if test -n "$INTLTOOL_PERL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 +$as_echo "$INTLTOOL_PERL" >&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 bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. - For example, HP-UX 11i declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif +if test -z "$INTLTOOL_PERL"; then + as_fn_error $? "perl not found" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 +$as_echo_n "checking for perl >= 5.8.1... " >&6; } +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 +$as_echo "$IT_PERL_VERSION" >&6; } +fi +if test "x" != "xno-xml"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 +$as_echo_n "checking for XML::Parser... " >&6; } + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + else + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 + fi +fi -#undef bind_textdomain_codeset +# Substitute ALL_LINGUAS so we can use it in po/Makefile -/* 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 bind_textdomain_codeset (); -/* 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_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif + +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int main () { -return bind_textdomain_codeset (); +extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr ; 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_bind_textdomain_codeset=yes +if ac_fn_c_try_link "$LINENO"; then : + DATADIRNAME=share else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then + case $host in + *-*-solaris*) + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : DATADIRNAME=share else DATADIRNAME=lib @@ -12840,10 +12879,8 @@ ;; esac fi - -rm -rf conftest.dSYM -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 fi @@ -12852,13 +12889,18 @@ + + + + + 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -12871,14 +12913,14 @@ 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_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -12886,10 +12928,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 $as_echo "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -12899,9 +12941,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -12914,14 +12956,14 @@ 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" - $as_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 ;; @@ -12929,10 +12971,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 $as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -12941,7 +12983,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -12954,70 +12996,72 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 + { $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:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } PKG_CONFIG="" fi - -fi - - -# Check whether --with-html-dir was given. -if test "${with_html_dir+set}" = set; then - withval=$with_html_dir; -else - with_html_dir='${datadir}/gtk-doc/html' fi - HTML_DIR="$with_html_dir" - # Check whether --enable-gtk-doc was given. -if test "${enable_gtk_doc+set}" = set; then - enableval=$enable_gtk_doc; + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 else - enable_gtk_doc=no -fi - + case $GTKDOC_CHECK in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # 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_GTKDOC_CHECK="$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 - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.4\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.4") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - : + ;; +esac +fi +GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } else - { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.4 installed to build gtk-doc" >&5 -$as_echo "$as_me: error: You need to have gtk-doc >= 1.4 installed to build gtk-doc" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - fi - { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } - for ac_prog in gtkdoc-check + for ac_prog in gtkdoc-rebase 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:$LINENO: checking for $ac_word" >&5 +{ $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_GTKDOC_CHECK+set}" = set; then +if ${ac_cv_path_GTKDOC_REBASE+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK in + case $GTKDOC_REBASE in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -13025,31 +13069,222 @@ 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_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_GTKDOC_REBASE="$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 + done IFS=$as_save_IFS ;; esac fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } +GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE +if test -n "$GTKDOC_REBASE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 +$as_echo "$GTKDOC_REBASE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$GTKDOC_CHECK" && break + test -n "$GTKDOC_REBASE" && break +done +test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" + + # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. +set dummy gtkdoc-mkpdf; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_MKPDF in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # 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_GTKDOC_MKPDF="$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 +fi +GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF +if test -n "$GTKDOC_MKPDF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 +$as_echo "$GTKDOC_MKPDF" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + +# Check whether --with-html-dir was given. +if test "${with_html_dir+set}" = set; then : + withval=$with_html_dir; +else + with_html_dir='${datadir}/gtk-doc/html' +fi + + HTML_DIR="$with_html_dir" + + + # Check whether --enable-gtk-doc was given. +if test "${enable_gtk_doc+set}" = set; then : + enableval=$enable_gtk_doc; +else + enable_gtk_doc=no +fi + + + if test x$enable_gtk_doc = xyes; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + : +else + as_fn_error $? "You need to have gtk-doc >= 1.4 installed to build $PACKAGE_NAME" "$LINENO" 5 +fi + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } + +if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: + +$GTKDOC_DEPS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + # Check whether --enable-gtk-doc-html was given. +if test "${enable_gtk_doc_html+set}" = set; then : + enableval=$enable_gtk_doc_html; +else + enable_gtk_doc_html=yes +fi + + # Check whether --enable-gtk-doc-pdf was given. +if test "${enable_gtk_doc_pdf+set}" = set; then : + enableval=$enable_gtk_doc_pdf; +else + enable_gtk_doc_pdf=no +fi + + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi if test x$enable_gtk_doc = xyes; then @@ -13060,6 +13295,22 @@ ENABLE_GTK_DOC_FALSE= fi + if test x$enable_gtk_doc_html = xyes; then + GTK_DOC_BUILD_HTML_TRUE= + GTK_DOC_BUILD_HTML_FALSE='#' +else + GTK_DOC_BUILD_HTML_TRUE='#' + GTK_DOC_BUILD_HTML_FALSE= +fi + + if test x$enable_gtk_doc_pdf = xyes; then + GTK_DOC_BUILD_PDF_TRUE= + GTK_DOC_BUILD_PDF_FALSE='#' +else + GTK_DOC_BUILD_PDF_TRUE='#' + GTK_DOC_BUILD_PDF_FALSE= +fi + if test -n "$LIBTOOL"; then GTK_DOC_USE_LIBTOOL_TRUE= GTK_DOC_USE_LIBTOOL_FALSE='#' @@ -13068,153 +13319,22 @@ GTK_DOC_USE_LIBTOOL_FALSE= fi - - - -for ac_header in locale.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 test -n "$GTKDOC_REBASE"; then + GTK_DOC_USE_REBASE_TRUE= + GTK_DOC_USE_REBASE_FALSE='#' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + GTK_DOC_USE_REBASE_TRUE='#' + GTK_DOC_USE_REBASE_FALSE= fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugzilla.gnome.org/enter_bug.cgi?product=libepc ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in locale.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +if test "x$ac_cv_header_locale_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_LOCALE_H 1 _ACEOF fi @@ -13222,16 +13342,12 @@ done if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 $as_echo_n "checking for LC_MESSAGES... " >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then +if ${am_cv_val_LC_MESSAGES+:} false; 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. */ #include int @@ -13242,46 +13358,19 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : am_cv_val_LC_MESSAGES=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_val_LC_MESSAGES=no + am_cv_val_LC_MESSAGES=no fi - -rm -rf conftest.dSYM -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 fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 $as_echo "$am_cv_val_LC_MESSAGES" >&6; } if test $am_cv_val_LC_MESSAGES = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_LC_MESSAGES 1 -_ACEOF +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h fi fi @@ -13294,155 +13383,20 @@ XGETTEXT=: INTLLIBS= - if test "${ac_cv_header_libintl_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 -$as_echo_n "checking for libintl.h... " >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -$as_echo "$ac_cv_header_libintl_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 -$as_echo_n "checking libintl.h usability... " >&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 -_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 -$as_echo_n "checking libintl.h presence... " >&6; } -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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 -{ $as_echo "$as_me:$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:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugzilla.gnome.org/enter_bug.cgi?product=libepc ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 -$as_echo_n "checking for libintl.h... " >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_libintl_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -$as_echo "$ac_cv_header_libintl_h" >&6; } - -fi -if test "x$ac_cv_header_libintl_h" = x""yes; then + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +if test "x$ac_cv_header_libintl_h" = xyes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" # # First check in libc # - { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 $as_echo_n "checking for ngettext in libc... " >&6; } -if test "${gt_cv_func_ngettext_libc+set}" = set; then +if ${gt_cv_func_ngettext_libc+:} false; 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. */ #include @@ -13455,54 +13409,25 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_ngettext_libc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_ngettext_libc=no + gt_cv_func_ngettext_libc=no fi - -rm -rf conftest.dSYM -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 fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 $as_echo "$gt_cv_func_ngettext_libc" >&6; } if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 $as_echo_n "checking for dgettext in libc... " >&6; } -if test "${gt_cv_func_dgettext_libc+set}" = set; then +if ${gt_cv_func_dgettext_libc+:} false; 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. */ #include @@ -13515,141 +13440,26 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_dgettext_libc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_dgettext_libc=no + gt_cv_func_dgettext_libc=no fi - -rm -rf conftest.dSYM -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 fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 $as_echo "$gt_cv_func_dgettext_libc" >&6; } fi if test "$gt_cv_func_ngettext_libc" = "yes" ; then - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+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. */ -/* 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 - -#undef $ac_func - -/* 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 - -int -main () -{ -return $ac_func (); - ; - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -13664,18 +13474,14 @@ || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then +if ${ac_cv_lib_intl_bindtextdomain+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -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. */ /* Override any GCC internal prototype to avoid an error. @@ -13693,55 +13499,26 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_bindtextdomain=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_bindtextdomain=no + ac_cv_lib_intl_bindtextdomain=no fi - -rm -rf conftest.dSYM -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 LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then +if ${ac_cv_lib_intl_ngettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -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. */ /* Override any GCC internal prototype to avoid an error. @@ -13759,55 +13536,26 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -rf conftest.dSYM -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 LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_ngettext" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 $as_echo_n "checking for dgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dgettext+set}" = set; then +if ${ac_cv_lib_intl_dgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -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. */ /* Override any GCC internal prototype to avoid an error. @@ -13825,43 +13573,18 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dgettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dgettext=no + ac_cv_lib_intl_dgettext=no fi - -rm -rf conftest.dSYM -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 LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 $as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = x""yes; then +if test "x$ac_cv_lib_intl_dgettext" = xyes; then : gt_cv_func_dgettext_libintl=yes fi @@ -13871,22 +13594,18 @@ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 $as_echo_n "checking if -liconv is needed to use gettext... " >&6; } - { $as_echo "$as_me:$LINENO: result: " >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then +if ${ac_cv_lib_intl_ngettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -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. */ /* Override any GCC internal prototype to avoid an error. @@ -13904,55 +13623,26 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -rf conftest.dSYM -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 LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_ngettext" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 $as_echo_n "checking for dcgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then +if ${ac_cv_lib_intl_dcgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -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. */ /* Override any GCC internal prototype to avoid an error. @@ -13970,43 +13660,18 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dcgettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dcgettext=no + ac_cv_lib_intl_dcgettext=no fi - -rm -rf conftest.dSYM -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 LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then +if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -14028,102 +13693,12 @@ glib_save_LIBS="$LIBS" LIBS="$LIBS -lintl $libintl_extra_libs" unset ac_cv_func_bind_textdomain_codeset - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+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. */ -/* 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 - -#undef $ac_func - -/* 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 - -int -main () -{ -return $ac_func (); - ; - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -14153,15 +13728,13 @@ if test "$gt_cv_have_gettext" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETTEXT 1 -_ACEOF +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_MSGFMT+set}" = set; then +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -14186,118 +13759,28 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 $as_echo "$MSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" LIBS="$LIBS $INTLLIBS" - -for ac_func in dcgettext -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+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. */ -/* 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 - -#undef $ac_func - -/* 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 - -int -main () -{ -return $ac_func (); - ; - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in dcgettext +do : + ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" +if test "x$ac_cv_func_dcgettext" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_DCGETTEXT 1 _ACEOF fi done MSGFMT_OPTS= - { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 $as_echo_n "checking if msgfmt accepts -c... " >&6; } cat >conftest.foo <<_ACEOF @@ -14312,14 +13795,14 @@ "Content-Transfer-Encoding: 8bit\n" _ACEOF -if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 +if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -else { $as_echo "$as_me:$LINENO: result: no" >&5 +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } echo "$as_me: failed input was:" >&5 sed 's/^/| /' conftest.foo >&5 @@ -14327,9 +13810,9 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_GMSGFMT+set}" = set; then +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -14342,14 +13825,14 @@ 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_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 test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -14358,19 +13841,19 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 $as_echo "$GMSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_XGETTEXT+set}" = set; then +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -14395,18 +13878,14 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 $as_echo "$XGETTEXT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - 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 @@ -14418,121 +13897,14 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : CATOBJEXT=.gmo DATADIRNAME=share else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in + case $host in *-*-solaris*) - { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+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. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. - For example, HP-UX 11i declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef bind_textdomain_codeset - -/* 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 bind_textdomain_codeset (); -/* 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_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif - -int -main () -{ -return bind_textdomain_codeset (); - ; - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_bind_textdomain_codeset=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -14541,16 +13913,18 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib ;; esac fi - -rm -rf conftest.dSYM -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 LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else @@ -14564,9 +13938,7 @@ if test "$gt_cv_have_gettext" = "yes" ; then -cat >>confdefs.h <<\_ACEOF -#define ENABLE_NLS 1 -_ACEOF +$as_echo "#define ENABLE_NLS 1" >>confdefs.h fi @@ -14574,7 +13946,7 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi @@ -14607,7 +13979,7 @@ if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 $as_echo_n "checking for catalogs to be installed... " >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do @@ -14632,7 +14004,7 @@ fi done LINGUAS=$NEW_LINGUAS - { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 $as_echo "$LINGUAS" >&6; } fi @@ -14666,13 +14038,18 @@ + + + + + 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -14685,14 +14062,14 @@ 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_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -14700,10 +14077,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 $as_echo "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -14713,9 +14090,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -14728,14 +14105,14 @@ 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" - $as_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 ;; @@ -14743,10 +14120,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 $as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -14755,7 +14132,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -14768,35 +14145,32 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.14 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 + { $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:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } PKG_CONFIG="" fi - fi -{ $as_echo "$as_me:$LINENO: checking for glib-genmarshal and glib-mkenums scripts" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-genmarshal and glib-mkenums scripts" >&5 $as_echo_n "checking for glib-genmarshal and glib-mkenums scripts... " >&6; } if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 ac_status=$? - $as_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 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { { $as_echo "$as_me:$LINENO: error: glib-2.0 not found" >&5 -$as_echo "$as_me: error: glib-2.0 not found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "glib-2.0 not found" "$LINENO" 5 fi @@ -14804,72 +14178,69 @@ LIBSOUP_24="libsoup-2.4 >= 2.3" LIBSOUP_22="libsoup-2.2 >= 2.2" -{ $as_echo "$as_me:$LINENO: checking for a suitable API version of libsoup" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a suitable API version of libsoup" >&5 $as_echo_n "checking for a suitable API version of libsoup... " >&6; } if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBSOUP_24\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSOUP_24\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBSOUP_24") 2>&5 ac_status=$? - $as_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 LIBSOUP_API=2.4 LIBSOUP=$LIBSOUP_24 else if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBSOUP_22\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSOUP_22\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBSOUP_22") 2>&5 ac_status=$? - $as_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 LIBSOUP_API=2.2 LIBSOUP=$LIBSOUP_22 -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBSOUP22 1 -_ACEOF +$as_echo "#define HAVE_LIBSOUP22 1" >>confdefs.h else - { { $as_echo "$as_me:$LINENO: error: no suitable libsoup API version found" >&5 -$as_echo "$as_me: error: no suitable libsoup API version found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no suitable libsoup API version found" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $LIBSOUP_API" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBSOUP_API" >&5 $as_echo "$LIBSOUP_API" >&6; } GIO_REQUIREMENT="gio-2.0 >= 2.15.1" -{ $as_echo "$as_me:$LINENO: checking for gio" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio" >&5 $as_echo_n "checking for gio... " >&6; } if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GIO_REQUIREMENT\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GIO_REQUIREMENT\""; } >&5 ($PKG_CONFIG --exists --print-errors "$GIO_REQUIREMENT") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } GIO=$GIO_REQUIREMENT else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for AVAHI_UI" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI_UI" >&5 $as_echo_n "checking for AVAHI_UI... " >&6; } if test -n "$AVAHI_UI_CFLAGS"; then pkg_cv_AVAHI_UI_CFLAGS="$AVAHI_UI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-ui >= 0.6\"") >&5 - ($PKG_CONFIG --exists --print-errors "avahi-ui >= 0.6") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-ui-gtk3 >= 0.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "avahi-ui-gtk3 >= 0.6") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_AVAHI_UI_CFLAGS=`$PKG_CONFIG --cflags "avahi-ui >= 0.6" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_AVAHI_UI_CFLAGS=`$PKG_CONFIG --cflags "avahi-ui-gtk3 >= 0.6" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14880,12 +14251,13 @@ pkg_cv_AVAHI_UI_LIBS="$AVAHI_UI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-ui >= 0.6\"") >&5 - ($PKG_CONFIG --exists --print-errors "avahi-ui >= 0.6") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-ui-gtk3 >= 0.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "avahi-ui-gtk3 >= 0.6") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_AVAHI_UI_LIBS=`$PKG_CONFIG --libs "avahi-ui >= 0.6" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_AVAHI_UI_LIBS=`$PKG_CONFIG --libs "avahi-ui-gtk3 >= 0.6" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14896,6 +14268,8 @@ if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -14903,14 +14277,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - AVAHI_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-ui >= 0.6" 2>&1` + AVAHI_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "avahi-ui-gtk3 >= 0.6" 2>&1` else - AVAHI_UI_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-ui >= 0.6" 2>&1` + AVAHI_UI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "avahi-ui-gtk3 >= 0.6" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$AVAHI_UI_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (avahi-ui >= 0.6) were not met: + as_fn_error $? "Package requirements (avahi-ui-gtk3 >= 0.6) were not met: $AVAHI_UI_PKG_ERRORS @@ -14919,34 +14293,13 @@ Alternatively, you may set the environment variables AVAHI_UI_CFLAGS and AVAHI_UI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -$as_echo "$as_me: error: Package requirements (avahi-ui >= 0.6) were not met: - -$AVAHI_UI_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables AVAHI_UI_CFLAGS -and AVAHI_UI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables AVAHI_UI_CFLAGS -and AVAHI_UI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -14955,25 +14308,24 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details" "$LINENO" 5; } else AVAHI_UI_CFLAGS=$pkg_cv_AVAHI_UI_CFLAGS AVAHI_UI_LIBS=$pkg_cv_AVAHI_UI_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for LIBEPC" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEPC" >&5 $as_echo_n "checking for LIBEPC... " >&6; } if test -n "$LIBEPC_CFLAGS"; then pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6 avahi-glib >= 0.6 glib-2.0 >= 2.12 gthread-2.0 >= 2.12 @@ -14982,7 +14334,7 @@ gnutls >= 1.4 uuid >= 1.36 \$LIBSOUP - \$GIO\"") >&5 + \$GIO\""; } >&5 ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6 avahi-glib >= 0.6 glib-2.0 >= 2.12 @@ -14994,8 +14346,8 @@ $LIBSOUP $GIO") 2>&5 ac_status=$? - $as_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 pkg_cv_LIBEPC_CFLAGS=`$PKG_CONFIG --cflags "avahi-client >= 0.6 avahi-glib >= 0.6 glib-2.0 >= 2.12 @@ -15006,6 +14358,7 @@ uuid >= 1.36 $LIBSOUP $GIO" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15016,7 +14369,7 @@ pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6 avahi-glib >= 0.6 glib-2.0 >= 2.12 gthread-2.0 >= 2.12 @@ -15025,7 +14378,7 @@ gnutls >= 1.4 uuid >= 1.36 \$LIBSOUP - \$GIO\"") >&5 + \$GIO\""; } >&5 ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6 avahi-glib >= 0.6 glib-2.0 >= 2.12 @@ -15037,8 +14390,8 @@ $LIBSOUP $GIO") 2>&5 ac_status=$? - $as_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 pkg_cv_LIBEPC_LIBS=`$PKG_CONFIG --libs "avahi-client >= 0.6 avahi-glib >= 0.6 glib-2.0 >= 2.12 @@ -15049,6 +14402,7 @@ uuid >= 1.36 $LIBSOUP $GIO" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15059,6 +14413,8 @@ if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -15066,7 +14422,7 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-client >= 0.6 + LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "avahi-client >= 0.6 avahi-glib >= 0.6 glib-2.0 >= 2.12 gthread-2.0 >= 2.12 @@ -15077,7 +14433,7 @@ $LIBSOUP $GIO" 2>&1` else - LIBEPC_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-client >= 0.6 + LIBEPC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "avahi-client >= 0.6 avahi-glib >= 0.6 glib-2.0 >= 2.12 gthread-2.0 >= 2.12 @@ -15091,27 +14447,7 @@ # Put the nasty error message in config.log where it belongs echo "$LIBEPC_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (avahi-client >= 0.6 - avahi-glib >= 0.6 - glib-2.0 >= 2.12 - gthread-2.0 >= 2.12 - gmodule-2.0 >= 2.0 - gobject-2.0 >= 2.4 - gnutls >= 1.4 - uuid >= 1.36 - $LIBSOUP - $GIO) were not met: - -$LIBEPC_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables LIBEPC_CFLAGS -and LIBEPC_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -$as_echo "$as_me: error: Package requirements (avahi-client >= 0.6 + as_fn_error $? "Package requirements (avahi-client >= 0.6 avahi-glib >= 0.6 glib-2.0 >= 2.12 gthread-2.0 >= 2.12 @@ -15129,23 +14465,13 @@ Alternatively, you may set the environment variables LIBEPC_CFLAGS and LIBEPC_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables LIBEPC_CFLAGS -and LIBEPC_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -15154,30 +14480,30 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details" "$LINENO" 5; } else LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for LIBEPC_UI" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEPC_UI" >&5 $as_echo_n "checking for LIBEPC_UI... " >&6; } if test -n "$LIBEPC_UI_CFLAGS"; then pkg_cv_LIBEPC_UI_CFLAGS="$LIBEPC_UI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.10\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_LIBEPC_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.10" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBEPC_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15188,12 +14514,13 @@ pkg_cv_LIBEPC_UI_LIBS="$LIBEPC_UI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.10\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_LIBEPC_UI_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.10" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBEPC_UI_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15204,6 +14531,8 @@ if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -15211,25 +14540,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBEPC_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.10" 2>&1` + LIBEPC_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0" 2>&1` else - LIBEPC_UI_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.10" 2>&1` + LIBEPC_UI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBEPC_UI_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.10) were not met: - -$LIBEPC_UI_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables LIBEPC_UI_CFLAGS -and LIBEPC_UI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.10) were not met: + as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0) were not met: $LIBEPC_UI_PKG_ERRORS @@ -15238,13 +14556,13 @@ Alternatively, you may set the environment variables LIBEPC_UI_CFLAGS and LIBEPC_UI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -15253,24 +14571,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables LIBEPC_UI_CFLAGS -and LIBEPC_UI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details" "$LINENO" 5; } else LIBEPC_UI_CFLAGS=$pkg_cv_LIBEPC_UI_CFLAGS LIBEPC_UI_LIBS=$pkg_cv_LIBEPC_UI_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -15280,69 +14587,8 @@ #AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/socket.h]) - - { $as_echo "$as_me:$LINENO: checking for uint16_t" >&5 -$as_echo_n "checking for uint16_t... " >&6; } -if test "${ac_cv_c_uint16_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_c_uint16_t=no - for ac_type in 'uint16_t' 'unsigned int' 'unsigned long int' \ - 'unsigned long long int' 'unsigned short int' 'unsigned char'; do - 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 -int -main () -{ -static int test_array [1 - 2 * !(($ac_type) -1 >> (16 - 1) == 1)]; -test_array [0] = 0 - - ; - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - case $ac_type in - uint16_t) ac_cv_c_uint16_t=yes ;; - *) ac_cv_c_uint16_t=$ac_type ;; -esac - -else - $as_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 - test "$ac_cv_c_uint16_t" != no && break - done -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_uint16_t" >&5 -$as_echo "$ac_cv_c_uint16_t" >&6; } - case $ac_cv_c_uint16_t in #( +ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t" +case $ac_cv_c_uint16_t in #( no|yes) ;; #( *) @@ -15355,18 +14601,14 @@ #AC_CHECK_FUNCS([memset setlocale socket strchr]) -{ $as_echo "$as_me:$LINENO: checking for aui_service_dialog_set_service_type_name in -lavahi-ui" >&5 -$as_echo_n "checking for aui_service_dialog_set_service_type_name in -lavahi-ui... " >&6; } -if test "${ac_cv_lib_avahi_ui_aui_service_dialog_set_service_type_name+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for aui_service_dialog_set_service_type_name in -lavahi-ui-gtk3" >&5 +$as_echo_n "checking for aui_service_dialog_set_service_type_name in -lavahi-ui-gtk3... " >&6; } +if ${ac_cv_lib_avahi_ui_gtk3_aui_service_dialog_set_service_type_name+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lavahi-ui ${AVAHI_UI_LIBS} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-lavahi-ui-gtk3 ${AVAHI_UI_LIBS} $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -15384,47 +14626,20 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_avahi_ui_aui_service_dialog_set_service_type_name=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_avahi_ui_gtk3_aui_service_dialog_set_service_type_name=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_avahi_ui_aui_service_dialog_set_service_type_name=no + ac_cv_lib_avahi_ui_gtk3_aui_service_dialog_set_service_type_name=no fi - -rm -rf conftest.dSYM -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 LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_avahi_ui_aui_service_dialog_set_service_type_name" >&5 -$as_echo "$ac_cv_lib_avahi_ui_aui_service_dialog_set_service_type_name" >&6; } -if test "x$ac_cv_lib_avahi_ui_aui_service_dialog_set_service_type_name" = x""yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avahi_ui_gtk3_aui_service_dialog_set_service_type_name" >&5 +$as_echo "$ac_cv_lib_avahi_ui_gtk3_aui_service_dialog_set_service_type_name" >&6; } +if test "x$ac_cv_lib_avahi_ui_gtk3_aui_service_dialog_set_service_type_name" = xyes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_SET_SERVICE_TYPE_NAME 1 -_ACEOF +$as_echo "#define HAVE_SET_SERVICE_TYPE_NAME 1" >>confdefs.h fi @@ -15459,13 +14674,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_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= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -15473,8 +14688,8 @@ (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 \). + # `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" @@ -15496,12 +14711,23 @@ :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:$LINENO: updating cache $cache_file" >&5 + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $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 @@ -15515,74 +14741,78 @@ 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. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + 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 + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + 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_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MAINTAINER_MODE\" 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_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ac_config_commands="$ac_config_commands po/stamp-it" if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then + as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then + as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then + as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +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. @@ -15592,17 +14822,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## 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=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -15610,23 +14841,15 @@ 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 - as_nl=' ' export as_nl @@ -15634,7 +14857,13 @@ 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 -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# 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 @@ -15645,7 +14874,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -15668,13 +14897,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -15684,15 +14906,16 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +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 ;; @@ -15704,12 +14927,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + 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='> ' @@ -15721,7 +14948,89 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# 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 + +# 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 + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -15735,8 +15044,12 @@ 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\(//\)$' \| \ @@ -15756,76 +15069,25 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - 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" || - { $as_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 +# 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 +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 + 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 rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -15854,8 +15116,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# 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 if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -15874,10 +15184,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -15892,13 +15202,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +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 libepc $as_me 0.3.11, which was -generated by GNU Autoconf 2.63. Invocation command line was +This file was extended by libepc $as_me 0.4.2, which was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15930,13 +15246,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$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. -Usage: $0 [OPTION]... [FILE]... +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 @@ -15955,16 +15273,18 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to . +libepc home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libepc config.status 0.3.11 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +libepc config.status 0.4.2 +configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -15982,11 +15302,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -16000,27 +15325,29 @@ 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 - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + 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 - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + 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 \ @@ -16028,11 +15355,10 @@ ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -16083,131 +15409,153 @@ 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_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared='`$ECHO "X$enable_shared" | $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"`' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + # Quote evaled strings. -for var in SED \ +for var in SHELL \ +ECHO \ +SED \ GREP \ EGREP \ FGREP \ @@ -16220,8 +15568,13 @@ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ +archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -16231,14 +15584,14 @@ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -SHELL \ -ECHO \ +nm_file_list_spec \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ lt_prog_compiler_pic \ +lt_prog_compiler_wl \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ +MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -16254,7 +15607,6 @@ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -16262,12 +15614,13 @@ libname_spec \ library_names_spec \ soname_spec \ +install_override_mode \ finish_eval \ old_striplib \ striplib; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -16289,14 +15642,15 @@ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -16304,12 +15658,6 @@ esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` - ;; -esac - ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' @@ -16350,9 +15698,7 @@ "libepc-ui-1.0.pc") CONFIG_FILES="$CONFIG_FILES libepc-ui-1.0.pc" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -16375,26 +15721,24 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + 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" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -16402,7 +15746,13 @@ if test -n "$CONFIG_FILES"; then -ac_cr=' ' +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' @@ -16410,7 +15760,7 @@ ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -16419,24 +15769,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -16444,7 +15788,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -16458,7 +15802,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -16472,7 +15816,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -16492,7 +15836,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -16524,23 +15868,29 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -16552,7 +15902,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -16564,13 +15914,11 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -16655,9 +16003,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -16670,9 +16016,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -16691,7 +16035,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -16700,12 +16044,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + 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 - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -16716,7 +16058,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $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. @@ -16728,10 +16070,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -16759,47 +16099,7 @@ 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=`$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_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -16856,7 +16156,6 @@ # 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 @@ -16866,12 +16165,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/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:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $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 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -16881,7 +16179,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -16909,27 +16207,24 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_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 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -16938,27 +16233,21 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -16996,7 +16285,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -17091,47 +16380,7 @@ q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - 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=`$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_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -17159,7 +16408,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -17207,6 +16457,12 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + # The host system. host_alias=$host_alias host=$host @@ -17256,9 +16512,11 @@ # turn newlines into spaces. NL2SP=$lt_lt_NL2SP -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -17266,13 +16524,30 @@ # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == "file_magic". +# Command to use when deplibs_check_method = "file_magic". file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + # The archiver. AR=$lt_AR + +# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + # A symbol stripping program. STRIP=$lt_STRIP @@ -17281,6 +16556,9 @@ old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + # A C compiler. LTCC=$lt_CC @@ -17299,14 +16577,14 @@ # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -# The name of the directory that contains temporary libtool files. -objdir=$objdir +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot -# An echo program that does not interpret backslashes. -ECHO=$lt_ECHO +# The name of the directory that contains temporary libtool files. +objdir=$objdir # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD @@ -17314,6 +16592,9 @@ # Must we lock files when doing compilation? need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -17370,6 +16651,9 @@ # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds @@ -17409,6 +16693,10 @@ # The linker used to build libraries. LD=$lt_LD +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds @@ -17421,12 +16709,12 @@ # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -17513,9 +16801,6 @@ # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -17531,6 +16816,9 @@ # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -17563,212 +16851,169 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -17777,10 +17022,8 @@ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; "po/stamp-it":C) - if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then - { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 -$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} - { (exit 1); exit 1; }; } + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then + as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -17803,15 +17046,12 @@ 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_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -17832,10 +17072,10 @@ 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:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $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 libepc-0.3.11/configure.ac libepc-0.4.2/configure.ac --- libepc-0.3.11/configure.ac 2010-03-23 13:05:04.000000000 +0000 +++ libepc-0.4.2/configure.ac 2011-10-13 14:48:38.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([libepc], [0.3.11], [https://bugzilla.gnome.org/enter_bug.cgi?product=libepc], [libepc], [http://live.gnome.org/libepc]) +AC_INIT([libepc], [0.4.2], [https://bugzilla.gnome.org/enter_bug.cgi?product=libepc], [libepc], [http://live.gnome.org/libepc]) AM_INIT_AUTOMAKE([1.10.3 -Wall dist-bzip2 no-define subdir-objects]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -20,7 +20,7 @@ dnl 4. If any interfaces have been added, then increment AGE. dnl 5. If any interfaces have been removed, then set AGE to 0. dnl -LT_VERSION_INFO="2:0:0" +LT_VERSION_INFO="3:0:0" AC_SUBST(LT_VERSION_INFO) GETTEXT_PACKAGE=libepc @@ -69,7 +69,7 @@ GIO=$GIO_REQUIREMENT], [AC_MSG_RESULT([no])]) -PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= 0.6]) +PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= 0.6]) PKG_CHECK_MODULES(LIBEPC, [avahi-client >= 0.6 avahi-glib >= 0.6 glib-2.0 >= 2.12 @@ -80,7 +80,7 @@ uuid >= 1.36 $LIBSOUP $GIO]) -PKG_CHECK_MODULES(LIBEPC_UI, [gtk+-2.0 >= 2.10]) +PKG_CHECK_MODULES(LIBEPC_UI, [gtk+-3.0 >= 3.0]) AC_SUBST(AVAHI_UI_CFLAGS) AC_SUBST(AVAHI_UI_LIBS) @@ -92,7 +92,7 @@ AC_TYPE_UINT16_T #AC_CHECK_FUNCS([memset setlocale socket strchr]) -AC_CHECK_LIB([avahi-ui], +AC_CHECK_LIB([avahi-ui-gtk3], [aui_service_dialog_set_service_type_name], [AC_DEFINE([HAVE_SET_SERVICE_TYPE_NAME], [1], [Define to 1 if you have aui_service_dialog_set_service_type_name.])], diff -Nru libepc-0.3.11/debian/changelog libepc-0.4.2/debian/changelog --- libepc-0.3.11/debian/changelog 2011-10-13 15:13:59.000000000 +0000 +++ libepc-0.4.2/debian/changelog 2011-10-13 15:14:00.000000000 +0000 @@ -1,3 +1,9 @@ +libepc (0.4.2-0ubuntu1openismus1) oneiric; urgency=low + + * New upstream release + + -- Murray Cumming Thu, 13 Oct 2011 16:56:06 +0200 + libepc (0.3.11-1) unstable; urgency=low * Update my email address. diff -Nru libepc-0.3.11/debian/control libepc-0.4.2/debian/control --- libepc-0.3.11/debian/control 2011-10-13 15:13:59.000000000 +0000 +++ libepc-0.4.2/debian/control 2011-10-13 15:14:00.000000000 +0000 @@ -14,7 +14,7 @@ pkg-config (>= 0.14), libavahi-client-dev (>= 0.6), libavahi-glib-dev (>= 0.6), - libavahi-ui-dev (>= 0.6.22), + libavahi-ui-gtk3-dev (>= 0.6.22), libglib2.0-dev (>= 2.15.1), libgnutls-dev (>= 1.4), libsoup2.4-dev, diff -Nru libepc-0.3.11/debian/control.in libepc-0.4.2/debian/control.in --- libepc-0.3.11/debian/control.in 2011-10-13 15:13:59.000000000 +0000 +++ libepc-0.4.2/debian/control.in 2011-10-13 15:14:00.000000000 +0000 @@ -9,7 +9,7 @@ pkg-config (>= 0.14), libavahi-client-dev (>= 0.6), libavahi-glib-dev (>= 0.6), - libavahi-ui-dev (>= 0.6.22), + libavahi-ui-gtk3-dev (>= 0.6.22), libglib2.0-dev (>= 2.15.1), libgnutls-dev (>= 1.4), libsoup2.4-dev, diff -Nru libepc-0.3.11/depcomp libepc-0.4.2/depcomp --- libepc-0.3.11/depcomp 2010-03-23 13:08:19.000000000 +0000 +++ libepc-0.4.2/depcomp 2011-10-13 14:51:55.000000000 +0000 @@ -17,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 diff -Nru libepc-0.3.11/docs/reference/libepc/html/consuming.html libepc-0.4.2/docs/reference/libepc/html/consuming.html --- libepc-0.3.11/docs/reference/libepc/html/consuming.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/consuming.html 2011-10-13 14:52:15.000000000 +0000 @@ -7,14 +7,9 @@ - - + + - - - - - @@ -22,17 +17,17 @@ - + -
+

Consuming

-EpcConsumer — lookup published values +EpcConsumer — lookup published values
-EpcProtocol — transport protocols +EpcProtocol — transport protocols

@@ -43,6 +38,6 @@

- Generated by GTK-Doc V1.11
+ Generated by GTK-Doc V1.18.1
- + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/dns-sd-support.html libepc-0.4.2/docs/reference/libepc/html/dns-sd-support.html --- libepc-0.3.11/docs/reference/libepc/html/dns-sd-support.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/dns-sd-support.html 2011-10-13 14:52:15.000000000 +0000 @@ -6,39 +6,34 @@ - - - + + + - - - - - - + - + -
+

DNS-SD Support

-EpcDispatcher — publish DNS-SD services +EpcDispatcher — publish DNS-SD services
-EpcServiceInfo — DNS-SD service descriptions +EpcServiceInfo — DNS-SD service descriptions
-EpcServiceMonitor — find DNS-SD services +EpcServiceMonitor — find DNS-SD services
-EpcServiceType — service type details +EpcServiceType — service type details

@@ -50,6 +45,6 @@

- Generated by GTK-Doc V1.11
+ Generated by GTK-Doc V1.18.1
- + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/EpcConsumer.html libepc-0.4.2/docs/reference/libepc/html/EpcConsumer.html --- libepc-0.3.11/docs/reference/libepc/html/EpcConsumer.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/EpcConsumer.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,1036 +0,0 @@ - - - - -EpcConsumer - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcConsumer

-

EpcConsumer — lookup published values

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc/consumer.h>
-
-#define             EPC_HTTP_ERROR
-                    EpcConsumerPrivate;
-                    EpcConsumerClass;
-                    EpcConsumer;
-
-EpcConsumer*        epc_consumer_new                    (const EpcServiceInfo *service);
-EpcConsumer*        epc_consumer_new_for_name           (const gchar *name);
-EpcConsumer*        epc_consumer_new_for_name_full      (const gchar *name,
-                                                         const gchar *application,
-                                                         const gchar *domain);
-
-EpcProtocol         epc_consumer_get_protocol           (EpcConsumer *consumer);
-const gchar*        epc_consumer_get_password           (EpcConsumer *consumer);
-const gchar*        epc_consumer_get_username           (EpcConsumer *consumer);
-
-void                epc_consumer_set_protocol           (EpcConsumer *consumer,
-                                                         EpcProtocol protocol);
-void                epc_consumer_set_password           (EpcConsumer *consumer,
-                                                         const gchar *password);
-void                epc_consumer_set_username           (EpcConsumer *consumer,
-                                                         const gchar *username);
-
-gboolean            epc_consumer_resolve_publisher      (EpcConsumer *consumer,
-                                                         guint timeout);
-gboolean            epc_consumer_is_publisher_resolved  (EpcConsumer *consumer);
-gpointer            epc_consumer_lookup                 (EpcConsumer *consumer,
-                                                         const gchar *key,
-                                                         gsize *length,
-                                                         GError **error);
-GList*              epc_consumer_list                   (EpcConsumer *consumer,
-                                                         const gchar *pattern,
-                                                         GError **error);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----EpcConsumer
-
-
-
-

Properties

-
-  "application"              gchar*                : Read / Write / Construct Only
-  "domain"                   gchar*                : Read / Write / Construct Only
-  "hostname"                 gchar*                : Read / Write / Construct Only
-  "name"                     gchar*                : Read / Write / Construct Only
-  "password"                 gchar*                : Read / Write / Construct
-  "path"                     gchar*                : Read / Write / Construct Only
-  "port"                     gint                  : Read / Write / Construct Only
-  "protocol"                 EpcProtocol           : Read / Write / Construct
-  "username"                 gchar*                : Read / Write / Construct
-
-
-
-

Signals

-
-  "authenticate"                                   : Run Last
-  "publisher-resolved"                             : Run First
-
-
-
-

Description

-

-The EpcConsumer object is used to lookup values published by an -EpcPublisher service. Currently HTTP is used for communication. -To find a publisher, use DNS-SD (also known as ZeroConf) to -list EPC_PUBLISHER_SERVICE_TYPE services. -

-

-

-
-

Example 1. Lookup a value

-
-  service_name = choose_recently_used_service ();
-
-  if (service_name)
-    consumer = epc_consumer_new_for_name (service_name);
-  else
-    consumer = epc_consumer_new (your_app_find_service ());
-
-  value = epc_consumer_lookup (consumer, "glom-settings", NULL, &error);
-  g_object_unref (consumer);
-
-  your_app_consume_value (value);
-  g_free (value);
-
-
-


-

-

-

-
-

Example 2. Find a publisher

-
-  dialog = aui_service_dialog_new ("Choose a Service", main_window,
-                                   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                   GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT,
-                                   NULL);
-
-  aui_service_dialog_set_browse_service_types (AUI_SERVICE_DIALOG (dialog),
-                                               EPC_SERVICE_TYPE_HTTPS,
-                                               EPC_SERVICE_TYPE_HTTP,
-                                               NULL);
-
- aui_service_dialog_set_service_type_name (AUI_SERVICE_DIALOG (dialog),
-                                           EPC_SERVICE_TYPE_HTTPS,
-                                           "Secure Transport");
- aui_service_dialog_set_service_type_name (AUI_SERVICE_DIALOG (dialog),
-                                           EPC_SERVICE_TYPE_HTTP,
-                                           "Insecure Transport");
-
- if (GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog)))
-  {
-     EpcServiceInfo *service =
-       epc_service_info_new (aui_service_dialog_get_service_type (AUI_SERVICE_DIALOG (dialog)),
-                             aui_service_dialog_get_host_name    (AUI_SERVICE_DIALOG (dialog)),
-                             aui_service_dialog_get_port         (AUI_SERVICE_DIALOG (dialog)),
-                             aui_service_dialog_get_txt_data     (AUI_SERVICE_DIALOG (dialog)));
-
-     consumer = epc_consumer_new (service);
-     epc_service_info_unref (service);
-     ...
-  }
-
-
-


-

-

-
-
-

Details

-
-

EPC_HTTP_ERROR

-
#define EPC_HTTP_ERROR              (epc_http_error_quark())
-
-

-Error domain for HTTP operations. Errors in this domain will -be from the SoupKnownStatusCode enumeration. See GError for -information on error domains.

-

-

-
-
-
-

EpcConsumerPrivate

-
typedef struct _EpcConsumerPrivate EpcConsumerPrivate;
-

-Private fields of the EpcConsumer class.

-

-

-
-
-
-

EpcConsumerClass

-
typedef struct {
-  void (*authenticate)       (EpcConsumer  *consumer,
-                              const gchar  *realm);
-
-  void (*publisher_resolved) (EpcConsumer  *consumer,
-                              EpcProtocol   protocol,
-                              const gchar  *hostname,
-                              guint         port);
-} EpcConsumerClass;
-
-

-Virtual methods of the EpcConsumer class.

-

-

-
-- - - - - - - - - - -

authenticate ()

 virtual method of the "authenticate" signal -

publisher_resolved ()

 virtual method of the "publisher-resolved" signal -
-
-
-
-

EpcConsumer

-
typedef struct _EpcConsumer EpcConsumer;
-

-Public fields of the EpcConsumer class.

-

-

-
-
-
-

epc_consumer_new ()

-
EpcConsumer*        epc_consumer_new                    (const EpcServiceInfo *service);
-

-Creates a new EpcConsumer object and associates it with a known -EpcPublisher. The service description can be retrieved, for instance, -by using EpcServiceMonitor, or by using the service selection dialog -of avahi-ui (AuiServiceDialog). -

-

-The connection is not established until functions like epc_consumer_lookup(), -epc_consumer_list() or epc_consumer_resolve_publisher are called.

-

-

-
-- - - - - - - - - - -

service :

 the publisher's service description -

Returns :

 The newly created EpcConsumer object -
-
-
-
-

epc_consumer_new_for_name ()

-
EpcConsumer*        epc_consumer_new_for_name           (const gchar *name);
-

-Creates a new EpcConsumer object and associates it with the EpcPublisher -announcing itself with name on the local network. The DNS-SD service name -used for searching the EpcPublisher is derived from the application's -program name as returned by g_get_prgname(). -

-

-See epc_consumer_new_for_name_full() for additional notes -and a method allowing better control over the search process.

-

-

-
-- - - - - - - - - - -

name :

 the service name of an EpcPublisher -

Returns :

 The newly created EpcConsumer object -
-
-
-
-

epc_consumer_new_for_name_full ()

-
EpcConsumer*        epc_consumer_new_for_name_full      (const gchar *name,
-                                                         const gchar *application,
-                                                         const gchar *domain);
-

-Creates a new EpcConsumer object and associates it with the EpcPublisher -announcing itself with name on domain. The DNS-SD service of the -EpcPublisher is derived from application using epc_service_type_new(). -

-

-

-
-

Note

-

- This function shall be used to re-connect to a formerly used EpcPublisher, - selected for instance from a list for recently used services. Therefore - using epc_consumer_new_for_name_full() is a quite optimistic approach for - contacting a publisher: You call it without really knowing if the - publisher you requested really exists. You only know that it existed - in the past when you added it to your list of recently used publishers, - but you do not know if it still exists. -

-

- To let your users choose from an up-to-date service list, you have to - use a dynamic service list as provided by avahi-ui for choosing a service - and pass the information this widget provides (hostname, port, protocol) - to epc_consumer_new(). -

-
-

-

-

-

-
-

Note

-

- The connection is not established until a function retrieving - data, like for instance epc_consumer_lookup(), is called. -

-

- Explicitly call epc_consumer_resolve_publisher() or connect to - the "publisher-resolved" signal, when your application - needs reliable information about the existance of the EpcPublisher - described by name. -

-
-

-

-
-- - - - - - - - - - - - - - - - - - -

name :

 the service name of an EpcPublisher -

application :

 the publisher's program name -

domain :

 the DNS domain of the EpcPublisher -

Returns :

 The newly created EpcConsumer object -
-
-
-
-

epc_consumer_get_protocol ()

-
EpcProtocol         epc_consumer_get_protocol           (EpcConsumer *consumer);
-

-Queries the transport protocol to use for contacting the publisher. -See "protocol" for details.

-

-

-
-- - - - - - - - - - -

consumer :

 a EpcConsumer -

Returns :

 The transport protocol this consumer uses. -
-
-
-
-

epc_consumer_get_password ()

-
const gchar*        epc_consumer_get_password           (EpcConsumer *consumer);
-

-Queries the password used for authentication. -See "password" for details.

-

-

-
-- - - - - - - - - - -

consumer :

 a EpcConsumer -

Returns :

 The password this consumer uses. -
-
-
-
-

epc_consumer_get_username ()

-
const gchar*        epc_consumer_get_username           (EpcConsumer *consumer);
-

-Queries the user name used for authentication. -See "username" for details.

-

-

-
-- - - - - - - - - - -

consumer :

 a EpcConsumer -

Returns :

 The user name this consumer uses. -
-
-
-
-

epc_consumer_set_protocol ()

-
void                epc_consumer_set_protocol           (EpcConsumer *consumer,
-                                                         EpcProtocol protocol);
-

-Changes the transport protocol to use for contacting the publisher. -See "protocol" for details.

-

-

-
-- - - - - - - - - - -

consumer :

 a EpcConsumer -

protocol :

 the new transport protocol -
-
-
-
-

epc_consumer_set_password ()

-
void                epc_consumer_set_password           (EpcConsumer *consumer,
-                                                         const gchar *password);
-

-Changes the password used for authentication. -See "password" for details.

-

-

-
-- - - - - - - - - - -

consumer :

 a EpcConsumer -

password :

 the new password, or NULL -
-
-
-
-

epc_consumer_set_username ()

-
void                epc_consumer_set_username           (EpcConsumer *consumer,
-                                                         const gchar *username);
-

-Changes the user name used for authentication. -See "username" for details.

-

-

-
-- - - - - - - - - - -

consumer :

 a EpcConsumer -

username :

 the new user name, or NULL -
-
-
-
-

epc_consumer_resolve_publisher ()

-
gboolean            epc_consumer_resolve_publisher      (EpcConsumer *consumer,
-                                                         guint timeout);
-

-Waits until the consumer has found its EpcPublisher. -A timeout of 0 requests infinite waiting. -

-

-See also: "publisher-resolved"

-

-

-
-- - - - - - - - - - - - - - -

consumer :

 a EpcConsumer -

timeout :

 the amount of milliseconds to wait -

Returns :

 TRUE when a publisher has been found, FALSE otherwise. -
-
-
-
-

epc_consumer_is_publisher_resolved ()

-
gboolean            epc_consumer_is_publisher_resolved  (EpcConsumer *consumer);
-

-Checks if the host name of this consumer's EpcPublisher -has been resolved already. -

-

-See also: epc_consumer_resolve_publisher(), "publisher-resolved"

-

-

-
-- - - - - - - - - - -

consumer :

 a EpcConsumer -

Returns :

 TRUE when the host name has been resolved, and FALSE otherwise. -
-
-
-
-

epc_consumer_lookup ()

-
gpointer            epc_consumer_lookup                 (EpcConsumer *consumer,
-                                                         const gchar *key,
-                                                         gsize *length,
-                                                         GError **error);
-

-If the call was successful, this returns a newly allocated buffer containing -the value the publisher provides for key. If the call was not -successful it returns NULL and sets error. The error domain is -EPC_HTTP_ERROR. Error codes are taken from the SoupKnownStatusCode -enumeration. -

-

-For instance, the error code will be SOUP_STATUS_FORBIDDEN if -authentication failed (see epc_publisher_set_auth_handler()). You must -include libsoup/soup-status.h -to use this error code. -

-

-The returned buffer should be freed when no longer needed. -

-

-See the description of EpcPublisher for discussion of NULL values.

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

consumer :

 the consumer -

key :

 unique key of the value -

length :

 location to store length in bytes of the contents, or NULL -

error :

 return location for a GError, or NULL -

Returns :

 A copy of the publisher's value for the the requested key, -or NULL when an error occurred. -
-
-
-
-

epc_consumer_list ()

-
GList*              epc_consumer_list                   (EpcConsumer *consumer,
-                                                         const gchar *pattern,
-                                                         GError **error);
-

-Matches published keys against patterns containing '*' (wildcard) and '?' -(joker). Passing NULL as pattern is equivalent to passing "*" and returns -all published keys. This function is useful to find and select dynamically -published values. See GPatternSpec for information about glob-style -patterns. -

-

-If the call was successful, a list of keys matching pattern is returned. -If the call was not successful, it returns NULL and sets error. -The error domain is EPC_HTTP_ERROR. Error codes are taken from the -SoupKnownStatusCode enumeration. -

-

-The returned list should be freed when no longer needed: -

-

-

-
- g_list_foreach (keys, (GFunc) g_free, NULL);
- g_list_free (keys);
-
-

-

-

-See also epc_publisher_list() for creating custom listings.

-

-

-
-- - - - - - - - - - - - - - - - - - -

consumer :

 a EpcConsumer -

pattern :

 a glob-style pattern, or NULL -

error :

 return location for a GError, or NULL -

Returns :

 A newly allocated list of keys, or NULL when an error occurred. -
-
-
-
-

Property Details

-
-

The "application" property

-
  "application"              gchar*                : Read / Write / Construct Only
-

Program name the publisher to use.

-

Default value: NULL

-
-
-
-

The "domain" property

-
  "domain"                   gchar*                : Read / Write / Construct Only
-

DNS domain of the publisher to use.

-

Default value: NULL

-
-
-
-

The "hostname" property

-
  "hostname"                 gchar*                : Read / Write / Construct Only
-

Host name of the publisher to use.

-

Default value: NULL

-
-
-
-

The "name" property

-
  "name"                     gchar*                : Read / Write / Construct Only
-

Service name of the publisher to use.

-

Default value: NULL

-
-
-
-

The "password" property

-
  "password"                 gchar*                : Read / Write / Construct
-

The password to use for authentication.

-

Default value: NULL

-
-
-
-

The "path" property

-
  "path"                     gchar*                : Read / Write / Construct Only
-

The path the publisher uses for contents.

-

Default value: "/contents"

-
-
-
-

The "port" property

-
  "port"                     gint                  : Read / Write / Construct Only
-

TCP/IP port of the publisher to use.

-

Allowed values: [0,65535]

-

Default value: 0

-
-
-
-

The "protocol" property

-
  "protocol"                 EpcProtocol           : Read / Write / Construct
-

The transport protocol to use for contacting the publisher.

-

Default value: EPC_PROTOCOL_UNKNOWN

-
-
-
-

The "username" property

-
  "username"                 gchar*                : Read / Write / Construct
-

The user name to use for authentication.

-

Default value: NULL

-
-
-
-

Signal Details

-
-

The "authenticate" signal

-
gboolean            user_function                      (EpcConsumer *consumer,
-                                                        gchar       *realm,
-                                                        gpointer     user_data)      : Run Last
-

-Emitted when the EpcConsumer requires authentication. The signal -handler should provide these credentials, which may come from the -user or from cached information by setting the "username" -and "password" properties. When providing credentials -the signal handler should return TRUE to stop signal emission. -

-

-If the provided credentials fail then the signal will be emmitted again.

-

-

-
-- - - - - - - - - - - - - - - - - - -

consumer :

 the EpcConsumer emitting the signal -

realm :

 the realm being authenticated to -

user_data :

user data set when the signal handler was connected.

Returns :

 TRUE when the signal handler handled the authentication request, -and FALSE otherwise. -
-
-
-
-

The "publisher-resolved" signal

-
void                user_function                      (EpcConsumer *consumer,
-                                                        EpcProtocol  protocol,
-                                                        gchar       *hostname,
-                                                        guint        port,
-                                                        gpointer     user_data)      : Run First
-

-This signal is emitted when a EpcConsumer created with -epc_consumer_new_for_name() or epc_consumer_new_for_name_full -has found its EpcPublisher. -

-

-Publisher detection is integrated with the GLib main loop. Therefore the -signal will not be emitted before a main loop is run (g_main_loop_run(), -gtk_main()). So to reliably consume this signal connect to it directly -after creating the EpcConsumer. -

-

-See also: epc_consumer_resolve_publisher(), epc_consumer_is_pulisher_resolved

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

consumer :

 the EpcConsumer emitting the signal -

protocol :

 the publisher's transport protocol -

hostname :

 the publisher's host name -

port :

 the publisher's TCP/IP port -

user_data :

user data set when the signal handler was connected.
-
-
-
-

See Also

-#EpcPublisher -
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/EpcDispatcher.html libepc-0.4.2/docs/reference/libepc/html/EpcDispatcher.html --- libepc-0.3.11/docs/reference/libepc/html/EpcDispatcher.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/EpcDispatcher.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,854 +0,0 @@ - - - - -EpcDispatcher - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcDispatcher

-

EpcDispatcher — publish DNS-SD services

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc/dispatcher.h>
-
-enum                EpcAddressFamily;
-enum                EpcCollisionHandling;
-                    EpcDispatcherPrivate;
-                    EpcDispatcherClass;
-                    EpcDispatcher;
-EpcDispatcher*      epc_dispatcher_new                  (const gchar *name);
-gboolean            epc_dispatcher_run                  (EpcDispatcher *dispatcher,
-                                                         GError **error);
-void                epc_dispatcher_reset                (EpcDispatcher *dispatcher);
-void                epc_dispatcher_add_service          (EpcDispatcher *dispatcher,
-                                                         EpcAddressFamily protocol,
-                                                         const gchar *type,
-                                                         const gchar *domain,
-                                                         const gchar *host,
-                                                         guint16 port,
-                                                         ...);
-void                epc_dispatcher_add_service_subtype  (EpcDispatcher *dispatcher,
-                                                         const gchar *type,
-                                                         const gchar *subtype);
-
-void                epc_dispatcher_set_collision_handling
-                                                        (EpcDispatcher *dispatcher,
-                                                         EpcCollisionHandling method);
-void                epc_dispatcher_set_cookie           (EpcDispatcher *dispatcher,
-                                                         const gchar *cookie);
-void                epc_dispatcher_set_name             (EpcDispatcher *dispatcher,
-                                                         const gchar *name);
-void                epc_dispatcher_set_service_details  (EpcDispatcher *dispatcher,
-                                                         const gchar *type,
-                                                         ...);
-
-EpcCollisionHandling  epc_dispatcher_get_collision_handling
-                                                        (EpcDispatcher *dispatcher);
-const gchar*        epc_dispatcher_get_cookie           (EpcDispatcher *dispatcher);
-const gchar*        epc_dispatcher_get_name             (EpcDispatcher *dispatcher);
-
-GEnumClass*         epc_address_family_get_class        (void);
-const gchar*        epc_address_family_to_string        (EpcAddressFamily value);
-GEnumClass*         epc_collision_handling_get_class    (void);
-const gchar*        epc_collision_handling_to_string    (EpcCollisionHandling value);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----EpcDispatcher
-
-
-
-

Properties

-
-  "collision-handling"       EpcCollisionHandling  : Read / Write / Construct
-  "cookie"                   gchar*                : Read / Write / Construct
-  "name"                     gchar*                : Read / Write / Construct
-
-
-
-

Description

-

-The EpcDispatcher object provides an easy method for publishing -DNS-SD services. Unlike established APIs like Avahi or HOWL the -EpcDispatcher doesn't expose any state changes reported by the -DNS-SD daemon, but instead tries to handle them automatically. Such state -changes include, for instance, name collisions or a restart of -the DNS-SD daemon. -

-

-

-
-

Example 7. Publish a printing service

-
-  dispatcher = epc_dispatcher_new ("Dead Tree Desecrator");
-
-  epc_dispatcher_add_service (dispatcher, EPC_ADDRESS_IPV4, "_ipp._tcp",
-                              NULL, NULL, 651, "path=/printers", NULL);
-  epc_dispatcher_add_service (dispatcher, EPC_ADDRESS_UNSPEC,
-                              "_duplex._sub._printer._tcp",
-                              NULL, NULL, 515, NULL);
-
-
-


-

-

-
-
-

Details

-
-

enum EpcAddressFamily

-
typedef enum
-{
-  EPC_ADDRESS_UNSPEC = AF_UNSPEC,
-  EPC_ADDRESS_IPV4 = AF_INET,
-  EPC_ADDRESS_IPV6 = AF_INET6
-}
-EpcAddressFamily;
-
-

-The address family to use for contacting network services.

-

-

-
-- - - - - - - - - - - - - - -

EPC_ADDRESS_UNSPEC

 No preferences exist. Use all address families supported. -

EPC_ADDRESS_IPV4

 Exclusively use IPv4 for addressing network services. -

EPC_ADDRESS_IPV6

 Exclusively use IPv6 for addressing network services. -
-
-
-
-

enum EpcCollisionHandling

-
typedef enum
-{
-  EPC_COLLISIONS_IGNORE,
-  EPC_COLLISIONS_CHANGE_NAME,
-  EPC_COLLISIONS_UNIQUE_SERVICE
-}
-EpcCollisionHandling;
-
-

-Various strategies for handling service name collisions.

-

-

-
-- - - - - - - - - - - - - - -

EPC_COLLISIONS_IGNORE

 Don't handle collisions at all, just fail silently. -

EPC_COLLISIONS_CHANGE_NAME

 Try to announce the service with another name. -

EPC_COLLISIONS_UNIQUE_SERVICE

 Defer own service announcement until the other service. -disappears. -
-
-
-
-

EpcDispatcherPrivate

-
typedef struct _EpcDispatcherPrivate EpcDispatcherPrivate;
-

-Private fields of the EpcDispatcher class.

-

-

-
-- -
-
-
-
-

EpcDispatcherClass

-
typedef struct {
-} EpcDispatcherClass;
-
-

-Virtual methods of the EpcDispatcher class.

-

-

-
-
-
-

EpcDispatcher

-
typedef struct _EpcDispatcher EpcDispatcher;
-

-Public fields of the EpcDispatcher class.

-

-

-
-
-
-

epc_dispatcher_new ()

-
EpcDispatcher*      epc_dispatcher_new                  (const gchar *name);
-

-Creates a new EpcDispatcher object for announcing a DNS-SD service. -The service is announced on all network interfaces. -

-

-Call epc_dispatcher_add_service() to actually announce a service.

-

-

-
-- - - - - - - - - - -

name :

 the human friendly name of the service -

Returns :

 the newly created EpcDispatcher object. -
-
-
-
-

epc_dispatcher_run ()

-
gboolean            epc_dispatcher_run                  (EpcDispatcher *dispatcher,
-                                                         GError **error);
-

-Starts the Avahi client of the EpcDispatcher. If the -client was not started, the function returns FALSE and sets error. The -error domain is EPC_AVAHI_ERROR. Possible error codes are those of the -Avahi library.

-

-

-
-- - - - - - - - - - - - - - -

dispatcher :

 a EpcDispatcher -

error :

 return location for a GError, or NULL -

Returns :

 TRUE when the dispatcher was started successfully, -FALSE if an error occurred. -
-
-
-
-

epc_dispatcher_reset ()

-
void                epc_dispatcher_reset                (EpcDispatcher *dispatcher);
-

-Revokes all service announcements of this EpcDispatcher.

-

-

-
-- - - - -

dispatcher :

 a EpcDispatcher -
-
-
-
-

epc_dispatcher_add_service ()

-
void                epc_dispatcher_add_service          (EpcDispatcher *dispatcher,
-                                                         EpcAddressFamily protocol,
-                                                         const gchar *type,
-                                                         const gchar *domain,
-                                                         const gchar *host,
-                                                         guint16 port,
-                                                         ...);
-

-Announces a TCP/IP service via DNS-SD. -

-

-The service type shall be a well-known DNS-SD service type as listed on -http://www.dns-sd.org/ServiceTypes.html. This function tries -to announce both the base service type and the sub service type when the -service name contains more than just one dot: Passing "_anon._sub._ftp._tcp" -for @type will announce the services "_ftp._tcp" and "_anon._sub._ftp._tcp". -

-

-The function can be called more than once. Is this necessary when the server -provides different access methods. For instance a web server could provide -HTTP and encrypted HTTPS services at the same time. Calling this function -multiple times also is useful for servers providing the same service at -different, but not all network interfaces of the host. -

-

-When passing %NULL for @domain, the service is announced within the local -network only, otherwise it is announced at the specified DNS domain. The -responsible server must be -configured to support DNS-SD. -

-

-Pass NULL for host to use the official host name of the machine to announce -the service. On machines with multiple DNS entries you might want to explictly -choose a fully qualified DNS name to announce the service.

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

dispatcher :

 a EpcDispatcher -

protocol :

 the EpcAddressFamily this service supports -

type :

 the machine friendly name of the service -

domain :

 the DNS domain for the announcement, or NULL -

host :

 the fully qualified host name of the service, or NULL -

port :

 the TCP/IP port of the service -

... :

 an optional list of TXT records, terminated by NULL -
-
-
-
-

epc_dispatcher_add_service_subtype ()

-
void                epc_dispatcher_add_service_subtype  (EpcDispatcher *dispatcher,
-                                                         const gchar *type,
-                                                         const gchar *subtype);
-

-Announces an additional sub service for a registered DNS-SD service. -

-

-

-
-

Note

-

-This function will fail silently, when the service specified by -type hasn't been registered yet. -

-
-

-

-
-- - - - - - - - - - - - - - -

dispatcher :

 a EpcDispatcher -

type :

 the base service type -

subtype :

 the sub service type -
-
-
-
-

epc_dispatcher_set_collision_handling ()

-
void                epc_dispatcher_set_collision_handling
-                                                        (EpcDispatcher *dispatcher,
-                                                         EpcCollisionHandling method);
-

-Changes the collision handling strategy the dispatcher uses. -See "collision-handling" for details.

-

-

-
-- - - - - - - - - - -

dispatcher :

 a EpcDispatcher -

method :

 the new strategy -
-

Since 0.3.1

-
-
-
-

epc_dispatcher_set_cookie ()

-
void                epc_dispatcher_set_cookie           (EpcDispatcher *dispatcher,
-                                                         const gchar *cookie);
-

-Changes the unique identifier of the service. -See "cookie" for details.

-

-

-
-- - - - - - - - - - -

dispatcher :

 a EpcDispatcher -

cookie :

 the new service identifier, or NULL -
-

Since 0.3.1

-
-
-
-

epc_dispatcher_set_name ()

-
void                epc_dispatcher_set_name             (EpcDispatcher *dispatcher,
-                                                         const gchar *name);
-

-Changes the user friendly name used for announcing services. -See "name".

-

-

-
-- - - - - - - - - - -

dispatcher :

 a EpcDispatcher -

name :

 the new user friendly name -
-
-
-
-

epc_dispatcher_set_service_details ()

-
void                epc_dispatcher_set_service_details  (EpcDispatcher *dispatcher,
-                                                         const gchar *type,
-                                                         ...);
-

-Updates the list of TXT records for a registered DNS-SD service. -The TXT records are specified by the service type and usually -have the form of key-value pairs: -

-

-

-
- path=/dwarf-blog/
-
-

-

-

-

-
-

Note

-

-This function will fail silently, when the service specified by -type hasn't been registered yet. -

-
-

-

-
-- - - - - - - - - - - - - - -

dispatcher :

 a EpcDispatcher -

type :

 the service type -

... :

 a list of TXT records, terminated by NULL -
-
-
-
-

epc_dispatcher_get_collision_handling ()

-
EpcCollisionHandling  epc_dispatcher_get_collision_handling
-                                                        (EpcDispatcher *dispatcher);
-

-Queries the collision handling strategy the dispatcher uses. -See "collision-handling" for details.

-

-

-
-- - - - - - - - - - -

dispatcher :

 a EpcDispatcher -

Returns :

 The dispatcher's collision handling strategy, -or EPC_COLLISIONS_IGNORE on error. -
-

Since 0.3.1

-
-
-
-

epc_dispatcher_get_cookie ()

-
const gchar*        epc_dispatcher_get_cookie           (EpcDispatcher *dispatcher);
-

-Queries the unique identifier of the service. -See "cookie" for details.

-

-

-
-- - - - - - - - - - -

dispatcher :

 a EpcDispatcher -

Returns :

 The unique identifier of the service, or NULL on error. -
-

Since 0.3.1

-
-
-
-

epc_dispatcher_get_name ()

-
const gchar*        epc_dispatcher_get_name             (EpcDispatcher *dispatcher);
-

-Queries the user friendly name used for announcing services. -See "name".

-

-

-
-- - - - - - - - - - -

dispatcher :

 a EpcDispatcher -

Returns :

 The user friendly name of the service. -
-
-
-
-

epc_address_family_get_class ()

-
GEnumClass*         epc_address_family_get_class        (void);
-

-Retrieves the GEnumClass describing the EpcAddressFamily enum.

-

-

-
-- - - - -

Returns :

 The GEnumClass describing EpcAddressFamily. -
-
-
-
-

epc_address_family_to_string ()

-
const gchar*        epc_address_family_to_string        (EpcAddressFamily value);
-

-Retrieves the name of a EpcAddressFamily value, or NULL when value is invalid.

-

-

-
-- - - - - - - - - - -

value :

 a EpcAddressFamily value -

Returns :

 The string representation of value, or NULL. -
-
-
-
-

epc_collision_handling_get_class ()

-
GEnumClass*         epc_collision_handling_get_class    (void);
-

-Retrieves the GEnumClass describing the EpcCollisionHandling enum.

-

-

-
-- - - - -

Returns :

 The GEnumClass describing EpcCollisionHandling. -
-
-
-
-

epc_collision_handling_to_string ()

-
const gchar*        epc_collision_handling_to_string    (EpcCollisionHandling value);
-

-Retrieves the name of a EpcCollisionHandling value, or NULL when value is invalid.

-

-

-
-- - - - - - - - - - -

value :

 a EpcCollisionHandling value -

Returns :

 The string representation of value, or NULL. -
-
-
-
-

Property Details

-
-

The "collision-handling" property

-
  "collision-handling"       EpcCollisionHandling  : Read / Write / Construct
-

The collision handling method to use.

-

Default value: EPC_COLLISIONS_CHANGE_NAME

-
-
-
-

The "cookie" property

-
  "cookie"                   gchar*                : Read / Write / Construct
-

Unique identifier of the service.

-

Default value: NULL

-
-
-
-

The "name" property

-
  "name"                     gchar*                : Read / Write / Construct
-

User friendly name of the service.

-

Default value: NULL

-
-
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/EpcPasswordDialog.html libepc-0.4.2/docs/reference/libepc/html/EpcPasswordDialog.html --- libepc-0.3.11/docs/reference/libepc/html/EpcPasswordDialog.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/EpcPasswordDialog.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,647 +0,0 @@ - - - - -EpcPasswordDialog - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcPasswordDialog

-

EpcPasswordDialog — common password dialog

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc-ui/password-dialog.h>
-
-                    EpcPasswordDialogClass;
-                    EpcPasswordDialogPrivate;
-                    EpcPasswordDialog;
-
-GtkWidget*          epc_password_dialog_new             (const gchar *title,
-                                                         GtkWindow *parent,
-                                                         const gchar *realm,
-                                                         const gchar *first_button_text,
-                                                         ...);
-
-void                epc_password_dialog_set_anonymous_allowed
-                                                        (EpcPasswordDialog *dialog,
-                                                         gboolean allowed);
-gboolean            epc_password_dialog_get_anonymous_allowed
-                                                        (EpcPasswordDialog *dialog);
-void                epc_password_dialog_set_anonymous   (EpcPasswordDialog *dialog,
-                                                         gboolean anonymous);
-gboolean            epc_password_dialog_is_anonymous    (EpcPasswordDialog *dialog);
-void                epc_password_dialog_set_username    (EpcPasswordDialog *dialog,
-                                                         const gchar *username);
-const gchar*        epc_password_dialog_get_username    (EpcPasswordDialog *dialog);
-void                epc_password_dialog_set_password    (EpcPasswordDialog *dialog,
-                                                         const gchar *password);
-const gchar*        epc_password_dialog_get_password    (EpcPasswordDialog *dialog);
-void                epc_password_dialog_set_realm       (EpcPasswordDialog *dialog,
-                                                         const gchar *realm);
-const gchar*        epc_password_dialog_get_realm       (EpcPasswordDialog *dialog);
-
-void                epc_password_dialog_attach          (EpcPasswordDialog *dialog,
-                                                         EpcConsumer *consumer);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GInitiallyUnowned
-         +----GtkObject
-               +----GtkWidget
-                     +----GtkContainer
-                           +----GtkBin
-                                 +----GtkWindow
-                                       +----GtkDialog
-                                             +----EpcPasswordDialog
-
-
-
-

Implemented Interfaces

-

-EpcPasswordDialog implements - AtkImplementorIface and GtkBuildable.

-
-
-

Properties

-
-  "anonymous"                gboolean              : Read / Write / Construct
-  "anonymous-allowed"        gboolean              : Read / Write / Construct
-  "password"                 gchar*                : Read / Write / Construct
-  "realm"                    gchar*                : Read / Write / Construct
-  "username"                 gchar*                : Read / Write / Construct
-
-
-
-

Description

-

-The EpcPasswordDialog provides an user interface -for the most common authentication scenarios.

-

-

-
-
-

Details

-
-

EpcPasswordDialogClass

-
typedef struct {
-} EpcPasswordDialogClass;
-
-

-Virtual methods of the EpcPasswordDialog class.

-

-

-
-
-
-

EpcPasswordDialogPrivate

-
typedef struct _EpcPasswordDialogPrivate EpcPasswordDialogPrivate;
-

-Private fields of the EpcPasswordDialog class.

-

-

-
-
-
-

EpcPasswordDialog

-
typedef struct _EpcPasswordDialog EpcPasswordDialog;
-

-Public fields of the EpcPasswordDialog class.

-

-

-
-
-
-

epc_password_dialog_new ()

-
GtkWidget*          epc_password_dialog_new             (const gchar *title,
-                                                         GtkWindow *parent,
-                                                         const gchar *realm,
-                                                         const gchar *first_button_text,
-                                                         ...);
-

-Creates a new EpcPasswordDialog instance.

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - -

title :

 title of the dialog, or NULL -

parent :

 transient parent of the dialog, or NULL -

realm :

 authentication realm, or NULL -

first_button_text :

 stock ID or text to go in first button, or NULL -

... :

 response ID for first button, then additional buttons, ending with NULL -

Returns :

 The newly created EpcEntropyWindow. -
-
-
-
-

epc_password_dialog_set_anonymous_allowed ()

-
void                epc_password_dialog_set_anonymous_allowed
-                                                        (EpcPasswordDialog *dialog,
-                                                         gboolean allowed);
-

-Toggles anonymous authentication support. With anonymous authentication -support an aditional checkbox for requesting anonymous authentication is -shown. See "anonymous-allowed" for details. -

-

-See also: epc_password_dialog_set_anonymous()

-

-

-
-- - - - - - - - - - -

dialog :

 a EpcPasswordDialog -

allowed :

 the new anonymous authentication support flag -
-
-
-
-

epc_password_dialog_get_anonymous_allowed ()

-
gboolean            epc_password_dialog_get_anonymous_allowed
-                                                        (EpcPasswordDialog *dialog);
-

-Queries if anonymous authentication is supported. With anonymous -authentication support an aditional checkbox for requesting anonymous -authentication is shown. See "anonymous-allowed" for -details. -

-

-See also: epc_password_dialog_is_anonymous()

-

-

-
-- - - - - - - - - - -

dialog :

 a EpcPasswordDialog -

Returns :

 TRUE if anonymous authentication is supported. -
-
-
-
-

epc_password_dialog_set_anonymous ()

-
void                epc_password_dialog_set_anonymous   (EpcPasswordDialog *dialog,
-                                                         gboolean anonymous);
-

-See also: epc_password_dialog_set_anonymous_allowed() -

-

-Changes the anonymous authentication state. -See "anonymous" for details.

-

-

-
-- - - - - - - - - - -

dialog :

 a EpcPasswordDialog -

anonymous :

 the new anonymous authentication state -
-
-
-
-

epc_password_dialog_is_anonymous ()

-
gboolean            epc_password_dialog_is_anonymous    (EpcPasswordDialog *dialog);
-

-Queries if anonymous authentication is requested. -See "anonymous" for details. -

-

-See also: epc_password_dialog_get_anonymous_allowed()

-

-

-
-- - - - - - - - - - -

dialog :

 a EpcPasswordDialog -

Returns :

 TRUE if anonymous authentication is requested. -
-
-
-
-

epc_password_dialog_set_username ()

-
void                epc_password_dialog_set_username    (EpcPasswordDialog *dialog,
-                                                         const gchar *username);
-

-Changes the current user name of the dialog. -See "username" for details.

-

-

-
-- - - - - - - - - - -

dialog :

 a EpcPasswordDialog -

username :

 the new username -
-
-
-
-

epc_password_dialog_get_username ()

-
const gchar*        epc_password_dialog_get_username    (EpcPasswordDialog *dialog);
-

-Queries the current user name of the dialog. -See "username" for details.

-

-

-
-- - - - - - - - - - -

dialog :

 a EpcPasswordDialog -

Returns :

 the current user name of the dialog. -
-
-
-
-

epc_password_dialog_set_password ()

-
void                epc_password_dialog_set_password    (EpcPasswordDialog *dialog,
-                                                         const gchar *password);
-

-Changes the current password of the dialog. -See "password" for details.

-

-

-
-- - - - - - - - - - -

dialog :

 a EpcPasswordDialog -

password :

 the new password -
-
-
-
-

epc_password_dialog_get_password ()

-
const gchar*        epc_password_dialog_get_password    (EpcPasswordDialog *dialog);
-

-Queries the current password of the dialog. -See "password" for details.

-

-

-
-- - - - - - - - - - -

dialog :

 a EpcPasswordDialog -

Returns :

 the current password of the dialog. -
-
-
-
-

epc_password_dialog_set_realm ()

-
void                epc_password_dialog_set_realm       (EpcPasswordDialog *dialog,
-                                                         const gchar *realm);
-

-Changes the authentication realm the dialog shows. -See "realm" for details.

-

-

-
-- - - - - - - - - - -

dialog :

 a EpcPasswordDialog -

realm :

 the new realm -
-
-
-
-

epc_password_dialog_get_realm ()

-
const gchar*        epc_password_dialog_get_realm       (EpcPasswordDialog *dialog);
-

-Queries the authentication realm of the dialog. -See "realm" for details.

-

-

-
-- - - - - - - - - - -

dialog :

 a EpcPasswordDialog -

Returns :

 the current realm of the dialog. -
-
-
-
-

epc_password_dialog_attach ()

-
void                epc_password_dialog_attach          (EpcPasswordDialog *dialog,
-                                                         EpcConsumer *consumer);
-

-Installs a EpcPasswordDialog as authentication handler for some -EpcConsumer by connecting to its "authenticate" and -"reauthenticate" signals.

-

-

-
-- - - - - - - - - - -

dialog :

 a EpcPasswordDialog -

consumer :

 the EpcConsumer -
-
-
-
-

Property Details

-
-

The "anonymous" property

-
  "anonymous"                gboolean              : Read / Write / Construct
-

Try to use anonymous authentication.

-

Default value: FALSE

-
-
-
-

The "anonymous-allowed" property

-
  "anonymous-allowed"        gboolean              : Read / Write / Construct
-

Show widget to allow anonymous authentication.

-

Default value: TRUE

-
-
-
-

The "password" property

-
  "password"                 gchar*                : Read / Write / Construct
-

The password to use for authentication.

-

Default value: NULL

-
-
-
-

The "realm" property

-
  "realm"                    gchar*                : Read / Write / Construct
-

The authentication realm the dialog is used for.

-

Default value: NULL

-
-
-
-

The "username" property

-
  "username"                 gchar*                : Read / Write / Construct
-

The username to use for authentication.

-

Default value: "david"

-
-
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/EpcProgressWindow.html libepc-0.4.2/docs/reference/libepc/html/EpcProgressWindow.html --- libepc-0.3.11/docs/reference/libepc/html/EpcProgressWindow.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/EpcProgressWindow.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,318 +0,0 @@ - - - - -EpcProgressWindow - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcProgressWindow

-

EpcProgressWindow — provide feedback during lengthly operations

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc-ui/progress-window.h>
-
-                    EpcProgressWindowClass;
-                    EpcProgressWindowPrivate;
-                    EpcProgressWindow;
-GtkWidget*          epc_progress_window_new             (const gchar *title,
-                                                         GtkWindow *parent,
-                                                         const gchar *message);
-void                epc_progress_window_update          (EpcProgressWindow *window,
-                                                         gdouble progress,
-                                                         const gchar *message);
-void                epc_progress_window_install         (GtkWindow *parent);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GInitiallyUnowned
-         +----GtkObject
-               +----GtkWidget
-                     +----GtkContainer
-                           +----GtkBin
-                                 +----GtkWindow
-                                       +----EpcProgressWindow
-
-
-
-

Implemented Interfaces

-

-EpcProgressWindow implements - AtkImplementorIface and GtkBuildable.

-
-
-

Properties

-
-  "message"                  gchar*                : Read / Write / Construct
-  "progress"                 gdouble               : Read / Write / Construct
-  "title"                    gchar*                : Read / Write / Construct
-
-
-
-

Description

-

-The EpcProgressWindow can be used to provide some feedback during -lengthly operations, like generating server keys. -

-

-See also: epc_tls_private_key_new()

-

-

-
-
-

Details

-
-

EpcProgressWindowClass

-
typedef struct {
-} EpcProgressWindowClass;
-
-

-Virtual methods of the EpcProgressWindow class.

-

-

-
-
-
-

EpcProgressWindowPrivate

-
typedef struct _EpcProgressWindowPrivate EpcProgressWindowPrivate;
-

-Private fields of the EpcProgressWindow class.

-

-

-
-
-
-

EpcProgressWindow

-
typedef struct _EpcProgressWindow EpcProgressWindow;
-

-Public fields of the EpcProgressWindow class.

-

-

-
-
-
-

epc_progress_window_new ()

-
GtkWidget*          epc_progress_window_new             (const gchar *title,
-                                                         GtkWindow *parent,
-                                                         const gchar *message);
-

-Creates a new EpcProgressWindow instance.

-

-

-
-- - - - - - - - - - - - - - - - - - -

title :

 the title of the window -

parent :

 the transient parent of the window, or NULL -

message :

 the message to show, or NULL -

Returns :

 The newly created EpcProgressWindow. -
-
-
-
-

epc_progress_window_update ()

-
void                epc_progress_window_update          (EpcProgressWindow *window,
-                                                         gdouble progress,
-                                                         const gchar *message);
-

-Updates the EpcProgressWindow with new progress information. The progress -is expressed as percentage in the range [0..1], or -1 if the progress cannot -be estimated. -

-

-See also: "message", "progress"

-

-

-
-- - - - - - - - - - - - - - -

window :

 a EpcProgressWindow -

progress :

 the current progress, or -1 -

message :

 a description of the current progress -
-
-
-
-

epc_progress_window_install ()

-
void                epc_progress_window_install         (GtkWindow *parent);
-

-Configures the hooks provided by libepc to use EpcProgressWindow when for -performing long standing tasks like for instance generating private keys. -

-

-See also: epc_tls_set_private_key_hooks()

-

-

-
-- - - - -

parent :

 the transient parent of the window, or NULL -
-
-
-
-

Property Details

-
-

The "message" property

-
  "message"                  gchar*                : Read / Write / Construct
-

The progress message to show.

-

Default value: NULL

-
-
-
-

The "progress" property

-
  "progress"                 gdouble               : Read / Write / Construct
-

Current progress, or -1.

-

Allowed values: [-1,1]

-

Default value: -1

-
-
-
-

The "title" property

-
  "title"                    gchar*                : Read / Write / Construct
-

The title to show.

-

Default value: NULL

-
-
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/EpcProtocol.html libepc-0.4.2/docs/reference/libepc/html/EpcProtocol.html --- libepc-0.3.11/docs/reference/libepc/html/EpcProtocol.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/EpcProtocol.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,279 @@ + + + + +EpcProtocol + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcProtocol

+

EpcProtocol — transport protocols

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc/protcol.h>
+
+enum                EpcProtocol;
+EpcProtocol         epc_protocol_from_name              (const gchar *name,
+                                                         EpcProtocol fallback);
+gchar *             epc_protocol_build_uri              (EpcProtocol protocol,
+                                                         const gchar *hostname,
+                                                         guint16 port,
+                                                         const gchar *path);
+const gchar *       epc_protocol_get_service_type       (EpcProtocol protocol);
+const gchar *       epc_protocol_get_uri_scheme         (EpcProtocol protocol);
+GEnumClass *        epc_protocol_get_class              (void);
+const gchar *       epc_protocol_to_string              (EpcProtocol value);
+
+
+
+

Object Hierarchy

+
+  GEnum
+   +----EpcProtocol
+
+
+
+

Description

+

+Since the Easy Publish and Consume library hides the details of the +transport mechanism used, it is possible to support different mechanisms. +Currently there is support for HTTP and HTTPS. +

+

+The EpcProtocol enumeration is the maximum of information libepc wants to +expose regarding its transport mechanisms. +

+
+
+

Details

+
+

enum EpcProtocol

+
typedef enum {
+  EPC_PROTOCOL_UNKNOWN,
+  EPC_PROTOCOL_HTTP,
+  EPC_PROTOCOL_HTTPS
+} EpcProtocol;
+
+

+The transport protocols supported by libepc. +

+
++ + + + + + + + + + + + + + +

EPC_PROTOCOL_UNKNOWN

Used when the transport protocol is not known yet. +

EPC_PROTOCOL_HTTP

Plain HTTP. Passwords are protected using HTTP digest +authentication, remaining data is transfered without any encryption. +

EPC_PROTOCOL_HTTPS

Encrypted HTTP. Attempts are made to use this +transport method when ever possible. +
+
+
+
+

epc_protocol_from_name ()

+
EpcProtocol         epc_protocol_from_name              (const gchar *name,
+                                                         EpcProtocol fallback);
+

+Parses the protocol name. Case of the name doesn't matter. Returns the +matching EpcProtocol, when the name was recognized, and the value of +fallback otherwise. +

+
++ + + + + + + + + + + + + + +

name :

a protocol name

fallback :

the EpcProtocol to use on errors

Returns :

The EpcProtocol matching name, or fallback on error.
+
+
+
+

epc_protocol_build_uri ()

+
gchar *             epc_protocol_build_uri              (EpcProtocol protocol,
+                                                         const gchar *hostname,
+                                                         guint16 port,
+                                                         const gchar *path);
+

+Builds the Unified Resource Identifier (URI) for a service. +The returned string should be released when no longer needed. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

protocol :

a EpcProtocol +

hostname :

the host to contact

port :

the service port

path :

the service path, or NULL +

Returns :

A newly allocated string with the URI for the service, +or NULL on error.
+
+
+
+

epc_protocol_get_service_type ()

+
const gchar *       epc_protocol_get_service_type       (EpcProtocol protocol);
+

+Queries the DNS-SD service type associated with a EpcProtocol. +See EPC_SERVICE_TYPE_HTTP, EPC_SERVICE_TYPE_HTTPS. +

+
++ + + + + + + + + + +

protocol :

a EpcProtocol +

Returns :

Returns the DNS-SD service type associated +with protocol, or NULL on unknown protocols.
+
+
+
+

epc_protocol_get_uri_scheme ()

+
const gchar *       epc_protocol_get_uri_scheme         (EpcProtocol protocol);
+

+Queries the URI scheme associated with a EpcProtocol. +See epc_service_type_build_uri(). +

+
++ + + + + + + + + + +

protocol :

a EpcProtocol +

Returns :

Returns the URI scheme associated with protocol, +or NULL on unknown protocols.
+
+
+
+

epc_protocol_get_class ()

+
GEnumClass *        epc_protocol_get_class              (void);
+

+Retrieves the GEnumClass describing the EpcProtocol enum. +

+
++ + + + +

Returns :

The GEnumClass describing EpcProtocol.
+
+
+
+

epc_protocol_to_string ()

+
const gchar *       epc_protocol_to_string              (EpcProtocol value);
+

+Retrieves the name of a EpcProtocol value, or NULL when value is invalid. +

+
++ + + + + + + + + + +

value :

a EpcProtocol value

Returns :

The string representation of value, or NULL.
+
+
+
+

See Also

+epc_service_type_new() +
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/EpcPublisher.html libepc-0.4.2/docs/reference/libepc/html/EpcPublisher.html --- libepc-0.3.11/docs/reference/libepc/html/EpcPublisher.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/EpcPublisher.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,1745 +0,0 @@ - - - - -EpcPublisher - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcPublisher

-

EpcPublisher — easily publish values

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc/publish.h>
-
-EpcContents *       (*EpcContentsHandler)               (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         gpointer user_data);
-                    EpcPublisherPrivate;
-                    EpcPublisherClass;
-                    EpcPublisher;
-
-EpcPublisher*       epc_publisher_new                   (const gchar *name,
-                                                         const gchar *application,
-                                                         const gchar *domain);
-
-void                epc_publisher_add                   (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         gconstpointer data,
-                                                         gssize length);
-void                epc_publisher_add_file              (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         const gchar *filename);
-void                epc_publisher_add_handler           (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         EpcContentsHandler handler,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data);
-void                epc_publisher_add_bookmark          (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         const gchar *label);
-gchar*              epc_publisher_get_path              (EpcPublisher *publisher,
-                                                         const gchar *key);
-gchar*              epc_publisher_get_uri               (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         GError **error);
-gboolean            epc_publisher_has_key               (EpcPublisher *publisher,
-                                                         const gchar *key);
-gpointer            epc_publisher_lookup                (EpcPublisher *publisher,
-                                                         const gchar *key);
-gboolean            epc_publisher_remove                (EpcPublisher *publisher,
-                                                         const gchar *key);
-GList*              epc_publisher_list                  (EpcPublisher *publisher,
-                                                         const gchar *pattern);
-
-gboolean            epc_publisher_run                   (EpcPublisher *publisher,
-                                                         GError **error);
-gboolean            epc_publisher_run_async             (EpcPublisher *publisher,
-                                                         GError **error);
-gboolean            epc_publisher_quit                  (EpcPublisher *publisher);
-
-gchar*              epc_publisher_expand_name           (const gchar *name,
-                                                         GError **error);
-
-void                epc_publisher_set_auth_flags        (EpcPublisher *publisher,
-                                                         EpcAuthFlags flags);
-void                epc_publisher_set_auth_handler      (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         EpcAuthHandler handler,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data);
-void                epc_publisher_set_collision_handling
-                                                        (EpcPublisher *publisher,
-                                                         EpcCollisionHandling method);
-void                epc_publisher_set_contents_path     (EpcPublisher *publisher,
-                                                         const gchar *path);
-void                epc_publisher_set_credentials       (EpcPublisher *publisher,
-                                                         const gchar *certfile,
-                                                         const gchar *keyfile);
-void                epc_publisher_set_protocol          (EpcPublisher *publisher,
-                                                         EpcProtocol protocol);
-void                epc_publisher_set_service_cookie    (EpcPublisher *publisher,
-                                                         const gchar *cookie);
-void                epc_publisher_set_service_name      (EpcPublisher *publisher,
-                                                         const gchar *name);
-
-EpcAuthFlags        epc_publisher_get_auth_flags        (EpcPublisher *publisher);
-const gchar*        epc_publisher_get_certificate_file  (EpcPublisher *publisher);
-EpcCollisionHandling  epc_publisher_get_collision_handling
-                                                        (EpcPublisher *publisher);
-const gchar*        epc_publisher_get_contents_path     (EpcPublisher *publisher);
-const gchar*        epc_publisher_get_private_key_file  (EpcPublisher *publisher);
-EpcProtocol         epc_publisher_get_protocol          (EpcPublisher *publisher);
-const gchar*        epc_publisher_get_service_cookie    (EpcPublisher *publisher);
-const gchar*        epc_publisher_get_service_domain    (EpcPublisher *publisher);
-const gchar*        epc_publisher_get_service_name      (EpcPublisher *publisher);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----EpcPublisher
-
-
-
-

Properties

-
-  "application"              gchar*                : Read / Write / Construct
-  "auth-flags"               EpcAuthFlags          : Read / Write / Construct
-  "certificate-file"         gchar*                : Read / Write / Construct
-  "collision-handling"       EpcCollisionHandling  : Read / Write / Construct
-  "contents-path"            gchar*                : Read / Write / Construct
-  "private-key-file"         gchar*                : Read / Write / Construct
-  "protocol"                 EpcProtocol           : Read / Write / Construct
-  "service-cookie"           gchar*                : Read / Write / Construct
-  "service-domain"           gchar*                : Read / Write / Construct
-  "service-name"             gchar*                : Read / Write / Construct
-
-
-
-

Description

-

-The EpcPublisher starts a HTTP server to publish information. -To allow EpcConsumer to find the publisher it automatically publishes -its contact information (host name, TCP/IP port) per DNS-SD. -

-

-In future it might use DNS-DS to notify EpcConsumer of changes. -

-

-

-
-

Example 6. Publish a value

-
-  publisher = epc_publisher_new ("Easy Publisher Example", NULL, NULL);
-
-  epc_publisher_add (publisher, "maman", "bar", -1);
-  epc_publisher_add_file (publisher, "source-code", __FILE__);
-
-  epc_publisher_run (NULL);
-
-
-


-

-

-EpcPublisher doesn't provide a way to explicitly publish NULL values, as -publishing NULL values doesn't seem very valueable in our scenario: Usually -you want to "publish" NULL values to express, that your application doesn't -have any meaningful information for the requested identifier. By "publishing" -a NULL value essentially you say "this information does not exist". So -publishing NULL values is not different from not publishing any value at -all or rejected access to some values. Without explicitly inspecting the -details for not receiving a value, a consumer calling epc_consumer_lookup() -has no chance to distinguish between the cases "never published", "network -problem", "authorization rejected", "no meaningful value available". -

-

-So if feel like publishing a NULL value, just remove the key in question -from the EpcPublisher by calling epc_publisher_remove(). When using a -custom EpcContentsHandler an alternate approach is returning NULL from -that handler. In that case the EpcPublisher will behave exactly the same, -as if the value has been removed.

-

-

-
-
-

Details

-
-

EpcContentsHandler ()

-
EpcContents *       (*EpcContentsHandler)               (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         gpointer user_data);
-

-This callback is used to generate custom contents published with the -epc_publisher_add_handler function. The arguments passed are the same as -passed to epc_publisher_add_handler. The EpcPublisher will decrease the -reference count of the returned buffer after deliving it. It's valid to -return NULL in situations were no contents can be generated.

-

-

-
-- - - - - - - - - - - - - - - - - - -

publisher :

 the EpcPublisher -

key :

 the unique key -

user_data :

 user data set when the signal handler was installed -

Returns :

 The EpcContents buffer for this publication, or NULL. -
-
-
-
-

EpcPublisherPrivate

-
typedef struct _EpcPublisherPrivate EpcPublisherPrivate;
-

-Private fields of the EpcPublisher class.

-

-

-
-
-
-

EpcPublisherClass

-
typedef struct {
-} EpcPublisherClass;
-
-

-Virtual methods of the EpcPublisher class.

-

-

-
-
-
-

EpcPublisher

-
typedef struct _EpcPublisher EpcPublisher;
-

-Public fields of the EpcPublisher class.

-

-

-
-
-
-

epc_publisher_new ()

-
EpcPublisher*       epc_publisher_new                   (const gchar *name,
-                                                         const gchar *application,
-                                                         const gchar *domain);
-

-Creates a new EpcPublisher object. The publisher announces its service -per DNS-SD to the DNS domain specified by domain, using name as service -name. The service type is derived from application. When NULL is passed -for application the value returned by g_get_prgname() is used. See -epc_service_type_new() for details.

-

-

-
-- - - - - - - - - - - - - - - - - - -

name :

 the human friendly service name, or NULL -

application :

 application name used for DNS-SD service type, or NULL -

domain :

 the DNS domain for announcing the service, or NULL -

Returns :

 The newly created EpcPublisher object. -
-
-
-
-

epc_publisher_add ()

-
void                epc_publisher_add                   (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         gconstpointer data,
-                                                         gssize length);
-

-Publishes a new value on the EpcPublisher using the unique key for -addressing. When -1 is passed for length, data is expected to be a -null-terminated string and its length in bytes is determined automatically -using strlen. -

-

-

-
-

Note

-

- Values published by the EpcPublisher can be arbitrary data, possibly - including null characters in the middle. The kind of data associated - with a key is chosen by the application providing values and should - be specified separately. -

-

- However, when publishing plain text it is strongly recommended - to use UTF-8 encoding to avoid internationalization issues. -

-
-

-

-
-- - - - - - - - - - - - - - - - - - -

publisher :

 a EpcPublisher -

key :

 the key for addressing the value -

data :

 the value to publish -

length :

 the length of data in bytes, or -1 if data is a null-terminated string. -
-
-
-
-

epc_publisher_add_file ()

-
void                epc_publisher_add_file              (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         const gchar *filename);
-

-Publishes a local file on the EpcPublisher using the unique -key for addressing. The publisher delivers the current contents -of the file at the time of access.

-

-

-
-- - - - - - - - - - - - - - -

publisher :

 a EpcPublisher -

key :

 the key for addressing the file -

filename :

 the name of the file to publish -
-
-
-
-

epc_publisher_add_handler ()

-
void                epc_publisher_add_handler           (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         EpcContentsHandler handler,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data);
-

-Publishes contents on the EpcPublisher which are generated by a custom -EpcContentsHandler callback. This is the most flexible method for publishing -information. -

-

-The handler is called on every request matching key. -When called, publisher, key and user_data are passed to the handler. -When replacing or deleting the resource referenced by key, -or when the the Publisher is destroyed, the function -described by destroy_data is called with user_data as argument.

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

publisher :

 a EpcPublisher -

key :

 the key for addressing the contents -

handler :

 the EpcContentsHandler for handling this contents -

user_data :

 data to pass on handler calls -

destroy_data :

 a function for releasing user_data -
-
-
-
-

epc_publisher_add_bookmark ()

-
void                epc_publisher_add_bookmark          (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         const gchar *label);
-

-Installs a dynamic HTTP (respectively HTTPS) bookmark for key. -This allows consumption of EpcPublisher resources by foreign -applications that support ZeroConf bookmarks, but not libepc. -This is useful for instance for publishing media playlists. -

-

-Passing NULL as key installs a bookmark for the root context of the -builtin web server. When passing NULL as label the publisher's name -is used as bookmark label. -

-

-

-
-

Note

-

- Dynamic bookmarks must be unique within the service domain. - Therefore the label will get modified on name collisions. -

-
-

-

-

-

-
-

Note

-

- This should be called after adding the resource identified by key, - not before. For instance, after calling epc_publisher_add(). -

-
-

-

-
-- - - - - - - - - - - - - - -

publisher :

 a EpcResource -

key :

 the key of the resource to publish, or NULL -

label :

 the bookmark's label, or NULL -
-
-
-
-

epc_publisher_get_path ()

-
gchar*              epc_publisher_get_path              (EpcPublisher *publisher,
-                                                         const gchar *key);
-

-Queries the path component of the URI used to publish the resource -associated with key. This is useful when referencing keys in published -resources. Passing NULL as key retrieve the path of the root context.

-

-

-
-- - - - - - - - - - - - - - -

publisher :

 a EpcPublisher -

key :

 the resource key to inspect, or NULL. -

Returns :

 The resource path for key. -
-
-
-
-

epc_publisher_get_uri ()

-
gchar*              epc_publisher_get_uri               (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         GError **error);
-

-Queries the URI used to publish the resource associated with key. -This is useful when referencing keys in published resources. When -passing NULL the publisher's base URI is returned. -

-

-The function fails if the publisher's host name cannot be retrieved. -In that case NULL is returned and error is set. The error domain is -EPC_AVAHI_ERROR. Possible error codes are those of the -Avahi library.

-

-

-
-- - - - - - - - - - - - - - - - - - -

publisher :

 a EpcPublisher -

key :

 the resource key to inspect, or NULL -

error :

 return location for a GError, or NULL -

Returns :

 The fully qualified URI for key, or NULL on error. -
-
-
-
-

epc_publisher_has_key ()

-
gboolean            epc_publisher_has_key               (EpcPublisher *publisher,
-                                                         const gchar *key);
-

-Checks if information is published for key. -

-

-This function allows to use the publisher as local key/value store, -which is useful for instance to prevent accidental key collisions. -

-

-See also: epc_publisher_lookup.

-

-

-
-- - - - - - - - - - - - - - -

publisher :

 a EcpPublisher -

key :

 the key for addressing contents -

Returns :

 TRUE when the publisher has information for key, -and FALSE otherwise. -
-
-
-
-

epc_publisher_lookup ()

-
gpointer            epc_publisher_lookup                (EpcPublisher *publisher,
-                                                         const gchar *key);
-

-Looks up the user_data passed to epc_publisher_add_handler() for key. -Returns NULL if the specified key doesn't exist or wasn't published -with epc_publisher_add_handler(). -

-

-This function allows to use the publisher as local key/value store, -which is useful for instance to prevent accidental key collisions. -

-

-See also: epc_publisher_has_key.

-

-

-
-- - - - - - - - - - - - - - -

publisher :

 a EcpPublisher -

key :

 the key for addressing contents -

Returns :

 The user_data associated with key, or NULL. -
-
-
-
-

epc_publisher_remove ()

-
gboolean            epc_publisher_remove                (EpcPublisher *publisher,
-                                                         const gchar *key);
-

-Removes a key and its associated contents from a EpcPublisher.

-

-

-
-- - - - - - - - - - - - - - -

publisher :

 a EpcPublisher -

key :

 the key for addressing the contents -

Returns :

 TRUE if the key was found and removed from the EpcPublisher. -
-
-
-
-

epc_publisher_list ()

-
GList*              epc_publisher_list                  (EpcPublisher *publisher,
-                                                         const gchar *pattern);
-

-Matches published keys against patterns containing '*' (wildcard) and '?' -(joker). Passing NULL as pattern is equivalent to passing "*" and returns -all published keys. This function is useful for generating dynamic resource -listings in other formats than libepc's specific format. See GPatternSpec -for information about glob-style patterns. -

-

-If the call was successful, a list of keys matching pattern is returned. -If the call was not successful, it returns NULL. -

-

-The returned list should be freed when no longer needed: -

-

-

-
- g_list_foreach (keys, (GFunc) g_free, NULL);
- g_list_free (keys);
-
-

-

-

-See also epc_consumer_list() for builtin listing capabilities.

-

-

-
-- - - - - - - - - - - - - - -

publisher :

 a EpcPublisher -

pattern :

 a glob-style pattern, or NULL -

Returns :

 A newly allocated list of keys, or NULL when an error occurred. -
-
-
-
-

epc_publisher_run ()

-
gboolean            epc_publisher_run                   (EpcPublisher *publisher,
-                                                         GError **error);
-

-Starts the server component of the EpcPublisher and blocks until it is -shutdown using epc_publisher_quit(). If the server could not be started, the -function returns FALSE and sets error. The error domain is -EPC_AVAHI_ERROR. Possible error codes are those of the -Avahi library. -

-

-When starting the publisher in HTTPS mode for the first time self-signed -keys must be generated. Generating secure keys needs some time, -so it is recommended to call epc_progress_window_install(), or -epc_shell_set_progress_hooks() to provide visual feedback during that -operation. Key generation takes place in a separate background thread and -the calling thread waits in a GMainLoop. Therefore the UI can remain -responsive when generating keys. -

-

-To start the server without blocking call epc_publisher_run_async().

-

-

-
-- - - - - - - - - - - - - - -

publisher :

 a EpcPublisher -

error :

 return location for a GError, or NULL -

Returns :

 TRUE when the publisher was successfully started, -FALSE if an error occurred. -
-
-
-
-

epc_publisher_run_async ()

-
gboolean            epc_publisher_run_async             (EpcPublisher *publisher,
-                                                         GError **error);
-

-Starts the server component of the EpcPublisher without blocking. If the -server could not be started then the function returns FALSE and sets error. The -error domain is EPC_AVAHI_ERROR. Possible error codes are those of the -Avahi library. -

-

-To stop the server component call epc_publisher_quit(). -See epc_publisher_run() for additional information.

-

-

-
-- - - - - - - - - - - - - - -

publisher :

 a EpcPublisher -

error :

 return location for a GError, or NULL -

Returns :

 TRUE when the publisher was successfully started, -FALSE if an error occurred. -
-
-
-
-

epc_publisher_quit ()

-
gboolean            epc_publisher_quit                  (EpcPublisher *publisher);
-

-Stops the server component of the EpcPublisher started with -epc_publisher_run() or epc_publisher_run_async. The functions -returns TRUE when the built-in server was running and had to -be stopped. If the server wasn't running the function returns -FALSE.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

Returns :

 TRUE when the server had to be stopped, and FALSE otherwise. -
-
-
-
-

epc_publisher_expand_name ()

-
gchar*              epc_publisher_expand_name           (const gchar *name,
-                                                         GError **error);
-

-Expands all known placeholders in name. Supported placeholders are: -

-

-

-
    -
  • %a: the program name as returned by g_get_application_name() -
    • -
  • %h: the machine's host name in title case
    • -
  • %u: the user's login name in title case
    • -
  • %U: the user's real name
    • -
  • %%: the percent sign
    • -
-

-

-

-The function fails when the host name cannot looked up. In that case NULL -is returned and error is set. The error domain is EPC_AVAHI_ERROR. -Possible error codes are those of the Avahi library.

-

-

-
-- - - - - - - - - - - - - - -

name :

 a service name with placeholders -

error :

 return location for a GError, or NULL -

Returns :

 The name with all known placeholders expanded, or NULL on error. -
-
-
-
-

epc_publisher_set_auth_flags ()

-
void                epc_publisher_set_auth_flags        (EpcPublisher *publisher,
-                                                         EpcAuthFlags flags);
-

-Changes the authentication settings the publisher uses -when epc_publisher_set_auth_handler() is used. -See "auth-flags" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

flags :

 new authentication settings -
-
-
-
-

epc_publisher_set_auth_handler ()

-
void                epc_publisher_set_auth_handler      (EpcPublisher *publisher,
-                                                         const gchar *key,
-                                                         EpcAuthHandler handler,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data);
-

-Installs an authentication handler for the specified key. -Passing NULL as key installs a fallback handler for all resources. -

-

-The handler is called on every request matching key. On this call -a temporary EpcAuthContext and user_data are passed to the handler. -The EpcAuthContext references the publisher and key passed here. -When replacing or deleting the resource referenced by key, or when -the publisher is destroyed, the function -described by destroy_data is called with user_data as argument. -

-

-

-
-

Note

-

- This should be called after adding the resource identified by key, - not before. For instance, after calling epc_publisher_add(). -

-
-

-

-

-See also epc_publisher_set_auth_flags().

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

publisher :

 a EpcPublisher -

key :

 the key of the resource to protect, or NULL -

handler :

 the EpcAuthHandler to connect -

user_data :

 data to pass on handler calls -

destroy_data :

 a function for releasing user_data -
-
-
-
-

epc_publisher_set_collision_handling ()

-
void                epc_publisher_set_collision_handling
-                                                        (EpcPublisher *publisher,
-                                                         EpcCollisionHandling method);
-

-Changes the collision handling strategy the publisher uses. -See "collision-handling" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

method :

 the new strategy -
-

Since 0.3.1

-
-
-
-

epc_publisher_set_contents_path ()

-
void                epc_publisher_set_contents_path     (EpcPublisher *publisher,
-                                                         const gchar *path);
-

-Changes the server path used for publishing contents. -See "contents-path" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

path :

 the new contents path -
-
-
-
-

epc_publisher_set_credentials ()

-
void                epc_publisher_set_credentials       (EpcPublisher *publisher,
-                                                         const gchar *certfile,
-                                                         const gchar *keyfile);
-

-Changes the file names of the PEM encoded TLS credentials the publisher use -for its services, when the transport "protocol" is -EPC_PROTOCOL_HTTPS. -

-

-See "certificate-file" and -"private-key-file" for details.

-

-

-
-- - - - - - - - - - - - - - -

publisher :

 a EpcPublisher -

certfile :

 file name of the server certificate -

keyfile :

 file name of the private key -
-
-
-
-

epc_publisher_set_protocol ()

-
void                epc_publisher_set_protocol          (EpcPublisher *publisher,
-                                                         EpcProtocol protocol);
-

-Changes the transport protocol the publisher uses. -See "protocol" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

protocol :

 the transport protocol -
-
-
-
-

epc_publisher_set_service_cookie ()

-
void                epc_publisher_set_service_cookie    (EpcPublisher *publisher,
-                                                         const gchar *cookie);
-

-Changes the unique identifier of the service. -See "service-cookie" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

cookie :

 the new service identifier, or NULL -
-

Since 0.3.1

-
-
-
-

epc_publisher_set_service_name ()

-
void                epc_publisher_set_service_name      (EpcPublisher *publisher,
-                                                         const gchar *name);
-

-Changes the human friendly name this EpcPublisher uses to announce its -service. See "service-name" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

name :

 the new name of this EpcPublisher -
-
-
-
-

epc_publisher_get_auth_flags ()

-
EpcAuthFlags        epc_publisher_get_auth_flags        (EpcPublisher *publisher);
-

-Queries the current authentication settings of the publisher. -See "auth-flags" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

Returns :

 The authentication settings of the publisher, -or EPC_AUTH_DEFAULT on error. -
-
-
-
-

epc_publisher_get_certificate_file ()

-
const gchar*        epc_publisher_get_certificate_file  (EpcPublisher *publisher);
-

-Queries the file name of the PEM encoded server certificate. -See "certificate-file" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

Returns :

 The certificate's file name, or NULL. -
-
-
-
-

epc_publisher_get_collision_handling ()

-
EpcCollisionHandling  epc_publisher_get_collision_handling
-                                                        (EpcPublisher *publisher);
-

-Queries the collision handling strategy the publisher uses. -See "collision-handling" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

Returns :

 The publisher's collision handling strategy, -or EPC_COLLISIONS_IGNORE on error. -
-

Since 0.3.1

-
-
-
-

epc_publisher_get_contents_path ()

-
const gchar*        epc_publisher_get_contents_path     (EpcPublisher *publisher);
-

-Queries the server path used for publishing contents. -See "contents-path" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

Returns :

 The server's contents path. -
-
-
-
-

epc_publisher_get_private_key_file ()

-
const gchar*        epc_publisher_get_private_key_file  (EpcPublisher *publisher);
-

-Queries the file name of the PEM encoded private server key. -See "private-key-file" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

Returns :

 The private key's file name, or NULL. -
-
-
-
-

epc_publisher_get_protocol ()

-
EpcProtocol         epc_publisher_get_protocol          (EpcPublisher *publisher);
-

-Queries the transport protocol the publisher uses. -See "protocol" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

Returns :

 The transport protocol the publisher uses, -or EPC_PROTOCOL_UNKNOWN on error. -
-
-
-
-

epc_publisher_get_service_cookie ()

-
const gchar*        epc_publisher_get_service_cookie    (EpcPublisher *publisher);
-

-Queries the unique identifier of the service. -See "service-cookie" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

Returns :

 The unique identifier of the service, or NULL on error. -
-

Since 0.3.1

-
-
-
-

epc_publisher_get_service_domain ()

-
const gchar*        epc_publisher_get_service_domain    (EpcPublisher *publisher);
-

-Queries the DNS domain for which this EpcPublisher announces its service. -See "domain" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

Returns :

 The DNS-SD domain of this EpcPublisher, or NULL. -
-
-
-
-

epc_publisher_get_service_name ()

-
const gchar*        epc_publisher_get_service_name      (EpcPublisher *publisher);
-

-Queries the human friendly name this EpcPublisher uses -to announce its service. See "name" for details.

-

-

-
-- - - - - - - - - - -

publisher :

 a EpcPublisher -

Returns :

 The human friendly name of this EpcPublisher. -
-
-
-
-

Property Details

-
-

The "application" property

-
  "application"              gchar*                : Read / Write / Construct
-

Program name for deriving the service type.

-

Default value: NULL

-
-
-
-

The "auth-flags" property

-
  "auth-flags"               EpcAuthFlags          : Read / Write / Construct
-

The authentication settings to use.

-
-
-
-

The "certificate-file" property

-
  "certificate-file"         gchar*                : Read / Write / Construct
-

File name for the PEM encoded server certificate.

-

Default value: NULL

-
-
-
-

The "collision-handling" property

-
  "collision-handling"       EpcCollisionHandling  : Read / Write / Construct
-

-The collision handling strategy the publisher uses.

-

-

-

Default value: EPC_COLLISIONS_CHANGE_NAME

-

Since 0.3.1

-
-
-
-

The "contents-path" property

-
  "contents-path"            gchar*                : Read / Write / Construct
-

The built-in server path for publishing resources.

-

Default value: "/contents"

-
-
-
-

The "private-key-file" property

-
  "private-key-file"         gchar*                : Read / Write / Construct
-

File name for the PEM encoded private server key.

-

Default value: NULL

-
-
-
-

The "protocol" property

-
  "protocol"                 EpcProtocol           : Read / Write / Construct
-

The transport protocol the publisher uses.

-

Default value: EPC_PROTOCOL_HTTPS

-
-
-
-

The "service-cookie" property

-
  "service-cookie"           gchar*                : Read / Write / Construct
-

-Unique identifier of the service. This cookie is used for implementing -EPC_COLLISIONS_UNIQUE_SERVICE, and usually is a UUID or the MD5/SHA1/... -checksum of a central document. When passing NULL, but using the -EPC_COLLISIONS_UNIQUE_SERVICE strategy a time based UUID is -generated and used as service identifier.

-

-

-

Default value: NULL

-

Since 0.3.1

-
-
-
-

The "service-domain" property

-
  "service-domain"           gchar*                : Read / Write / Construct
-

Internet domain for publishing the service.

-

Default value: NULL

-
-
-
-

The "service-name" property

-
  "service-name"             gchar*                : Read / Write / Construct
-

User friendly name for the service.

-

Default value: NULL

-
-
-
-

See Also

-#EpcConsumer, EpcAuthContext, EpcContentsHandler -
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/EpcServiceInfo.html libepc-0.4.2/docs/reference/libepc/html/EpcServiceInfo.html --- libepc-0.3.11/docs/reference/libepc/html/EpcServiceInfo.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/EpcServiceInfo.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,402 @@ + + + + +EpcServiceInfo + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcServiceInfo

+

EpcServiceInfo — DNS-SD service descriptions

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc/service-info.h>
+
+                    EpcServiceInfo;
+EpcServiceInfo *    epc_service_info_new                (const gchar *type,
+                                                         const gchar *host,
+                                                         guint port,
+                                                         const AvahiStringList *details);
+EpcServiceInfo *    epc_service_info_new_full           (const gchar *type,
+                                                         const gchar *host,
+                                                         guint port,
+                                                         const AvahiStringList *details,
+                                                         const AvahiAddress *address,
+                                                         const gchar *ifname);
+EpcServiceInfo *    epc_service_info_ref                (EpcServiceInfo *info);
+void                epc_service_info_unref              (EpcServiceInfo *info);
+
+const AvahiAddress * epc_service_info_get_address       (const EpcServiceInfo *info);
+EpcAddressFamily    epc_service_info_get_address_family (const EpcServiceInfo *info);
+const gchar *       epc_service_info_get_detail         (const EpcServiceInfo *info,
+                                                         const gchar *name);
+const gchar *       epc_service_info_get_host           (const EpcServiceInfo *info);
+const gchar *       epc_service_info_get_interface      (const EpcServiceInfo *info);
+guint               epc_service_info_get_port           (const EpcServiceInfo *info);
+const gchar *       epc_service_info_get_service_type   (const EpcServiceInfo *info);
+
+
+
+

Object Hierarchy

+
+  GBoxed
+   +----EpcServiceInfo
+
+
+
+

Description

+

+The EpcServiceInfo object describes DNS-SD services. +

+
+
+

Details

+
+

EpcServiceInfo

+
typedef struct _EpcServiceInfo EpcServiceInfo;
+

+Description of a network service. +See also: epc_service_monitor_new(). +

+
+
+
+

epc_service_info_new ()

+
EpcServiceInfo *    epc_service_info_new                (const gchar *type,
+                                                         const gchar *host,
+                                                         guint port,
+                                                         const AvahiStringList *details);
+

+Creates a new service description using the information provided. The +details list usually is retrieved from the TXT record the dynamic naming +system (DNS) provides for the service. When using Avahi's service chooser +aui_service_dialog_get_txt_data() can be used for getting a details list. +To create an ad-hoc list use avahi_string_list_new() and related functions. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

type :

the DNS-SD service type

host :

the DNS hostname

port :

the TCP/IP port

details :

list of key-value pairs, or NULL +

Returns :

The newly created service description, or NULL on error.
+
+
+
+

epc_service_info_new_full ()

+
EpcServiceInfo *    epc_service_info_new_full           (const gchar *type,
+                                                         const gchar *host,
+                                                         guint port,
+                                                         const AvahiStringList *details,
+                                                         const AvahiAddress *address,
+                                                         const gchar *ifname);
+

+Creates a new service description using the information provided. The +details list usually is retrieved from the TXT record the dynamic naming +system (DNS) provides for the service. When using Avahi's service chooser +aui_service_dialog_get_txt_data() can be used for getting a details list. +To create an ad-hoc list use avahi_string_list_new() and related functions. +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

type :

the DNS-SD service type

host :

the DNS hostname

port :

the TCP/IP port

details :

list of key-value pairs, or NULL +

address :

IP address of the service, or NULL +

ifname :

network interface for contacting the service, or NULL +

Returns :

The newly created service description, or NULL on error.
+
+
+
+

epc_service_info_ref ()

+
EpcServiceInfo *    epc_service_info_ref                (EpcServiceInfo *info);
+

+Increases the reference count of info by one. +See also: epc_service_info_unref() +

+
++ + + + + + + + + + +

info :

a EpcServiceInfo +

Returns :

The same info object.
+
+
+
+

epc_service_info_unref ()

+
void                epc_service_info_unref              (EpcServiceInfo *info);
+

+Decreases the reference count of info by one. When its reference count +drops to 0, the object is finalized (i.e. its memory is freed). +

+

+See also: epc_service_info_ref() +

+
++ + + + +

info :

a EpcServiceInfo +
+
+
+
+

epc_service_info_get_address ()

+
const AvahiAddress * epc_service_info_get_address       (const EpcServiceInfo *info);
+

+Retrieves the IP address for contacting the service, +or NULL when that information is not available. +

+
++ + + + + + + + + + +

info :

a EpcServiceInfo +

Returns :

A IP address, or NULL.
+
+
+
+

epc_service_info_get_address_family ()

+
EpcAddressFamily    epc_service_info_get_address_family (const EpcServiceInfo *info);
+

+Retrieves the address family for contacting the service, +or EPC_ADDRESS_UNSPEC when that information is not available. +

+
++ + + + + + + + + + +

info :

a EpcServiceInfo +

Returns :

A EpcAddressFamily.
+
+
+
+

epc_service_info_get_detail ()

+
const gchar *       epc_service_info_get_detail         (const EpcServiceInfo *info,
+                                                         const gchar *name);
+

+Retrieves a detail stored in the service's TXT record. +Returns NULL when the requested information is not available. +

+
++ + + + + + + + + + + + + + +

info :

a EpcServiceInfo +

name :

the detail's name

Returns :

The requested service detail, or NULL.
+
+
+
+

epc_service_info_get_host ()

+
const gchar *       epc_service_info_get_host           (const EpcServiceInfo *info);
+

+Retrieves the DNS host name associated with info. +

+
++ + + + + + + + + + +

info :

a EpcServiceInfo +

Returns :

A DNS host name.
+
+
+
+

epc_service_info_get_interface ()

+
const gchar *       epc_service_info_get_interface      (const EpcServiceInfo *info);
+

+Retrieves the name of the network interface which must be used for +contacting the service, or NULL when that information is not available. +

+
++ + + + + + + + + + +

info :

a EpcServiceInfo +

Returns :

A network interface name, or NULL.
+
+
+
+

epc_service_info_get_port ()

+
guint               epc_service_info_get_port           (const EpcServiceInfo *info);
+

+Retrieves the TCP/IP port associated with info. +

+
++ + + + + + + + + + +

info :

a EpcServiceInfo +

Returns :

A TCP/IP port.
+
+
+
+

epc_service_info_get_service_type ()

+
const gchar *       epc_service_info_get_service_type   (const EpcServiceInfo *info);
+

+Retrieves the DNS-SD service type associated with info. +

+
++ + + + + + + + + + +

info :

a EpcServiceInfo +

Returns :

A DNS-SD service type.
+
+
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/EpcServiceMonitor.html libepc-0.4.2/docs/reference/libepc/html/EpcServiceMonitor.html --- libepc-0.3.11/docs/reference/libepc/html/EpcServiceMonitor.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/EpcServiceMonitor.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,559 +0,0 @@ - - - - -EpcServiceMonitor - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcServiceMonitor

-

EpcServiceMonitor — find DNS-SD services

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc/service-monitor.h>
-
-                    EpcServiceMonitorClass;
-                    EpcServiceMonitorPrivate;
-                    EpcServiceMonitor;
-EpcServiceMonitor*  epc_service_monitor_new             (const gchar *application,
-                                                         const gchar *domain,
-                                                         EpcProtocol first_protocol,
-                                                         ...);
-EpcServiceMonitor*  epc_service_monitor_new_for_types   (const gchar *domain,
-                                                         ...);
-EpcServiceMonitor*  epc_service_monitor_new_for_types_strv
-                                                        (const gchar *domain,
-                                                         gchar **types);
-void                epc_service_monitor_set_skip_our_own
-                                                        (EpcServiceMonitor *monitor,
-                                                         gboolean setting);
-gboolean            epc_service_monitor_get_skip_our_own
-                                                        (EpcServiceMonitor *monitor);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----EpcServiceMonitor
-
-
-
-

Properties

-
-  "application"              gchar*                : Read / Write / Construct Only
-  "domain"                   gchar*                : Read / Write / Construct Only
-  "service-types"            GStrv*                : Read / Write / Construct Only
-  "skip-our-own"             gboolean              : Read / Write / Construct
-
-
-
-

Signals

-
-  "scanning-done"                                  : Run First
-  "service-found"                                  : Run First
-  "service-removed"                                : Run First
-
-
-
-

Description

-

-The EpcServiceMonitor object provides an easy method for finding DNS-SD -services. It hides all the boring state and callback handling Avahi -requires, and just exposes three simple GObject signals: -"service-found", "service-removed" -and "scanning-done". -

-

-

-
-

Example 8. Find an Easy-Publish service

-
-  monitor = epc_service_monitor_new ("glom", NULL, EPC_PROTOCOL_UNKNOWN);
-
-  g_signal_connect (monitor, "service-found", service_found_cb, self);
-  g_signal_connect (monitor, "service-removed", service_removed_cb, self);
-
-  g_main_loop_run (loop);
-
-
-


-

-

-
-
-

Details

-
-

EpcServiceMonitorClass

-
typedef struct {
-  void (*service_found)   (EpcServiceMonitor  *monitor,
-                           const gchar        *name,
-                           EpcServiceInfo     *info);
-  void (*service_removed) (EpcServiceMonitor  *monitor,
-                           const gchar        *name,
-                           const gchar        *type);
-  void (*scanning_done)   (EpcServiceMonitor  *monitor,
-                           const gchar        *type);
-} EpcServiceMonitorClass;
-
-

-Virtual methods of the EpcServiceMonitor class.

-

-

-
-- - - - - - - - - - - - - - -

service_found ()

 virtual method of the "service-found" signal -

service_removed ()

 virtual method of the "service-removed" signal -

scanning_done ()

 virtual method of the "scanning-done" signal -
-
-
-
-

EpcServiceMonitorPrivate

-
typedef struct _EpcServiceMonitorPrivate EpcServiceMonitorPrivate;
-

-Private fields of the EpcServiceMonitor class.

-

-

-
-
-
-

EpcServiceMonitor

-
typedef struct _EpcServiceMonitor EpcServiceMonitor;
-

-Public fields of the EpcServiceMonitor class.

-

-

-
-
-
-

epc_service_monitor_new ()

-
EpcServiceMonitor*  epc_service_monitor_new             (const gchar *application,
-                                                         const gchar *domain,
-                                                         EpcProtocol first_protocol,
-                                                         ...);
-

-Creates a new service monitor watching the specified domain for a -certain application using one of the protocols listed. Passing NULL for -application lists all libepc based applications. Passing NULL for domain -monitors the local network. Passing an empty protocol list requests -monitoring of all service-types supported by the library (see -epc_service_type_list_supported()).

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

application :

 name of the application to monitor, or NULL -

domain :

 the DNS domain to monitor, or NULL -

first_protocol :

 the first protocol to monitor -

... :

 a list of additional protocols, terminated by EPC_PROTOCOL_UNKNOWN -

Returns :

 The newly created service monitor. -
-
-
-
-

epc_service_monitor_new_for_types ()

-
EpcServiceMonitor*  epc_service_monitor_new_for_types   (const gchar *domain,
-                                                         ...);
-

-Creates a new service monitor watching the specified domain for the -service-types listed. Passing NULL for domain monitors the local network. -Passing an empty service list requests monitoring of all service-types -supported by the library (see epc_service_type_list_supported()). -

-

-See also: epc_service_monitor_new_for_types_strv()

-

-

-
-- - - - - - - - - - - - - - -

domain :

 the DNS domain to monitor, or NULL -

... :

 a NULL terminated list of service types to monitor -

Returns :

 The newly created service monitor. -
-

Since 0.3.1

-
-
-
-

epc_service_monitor_new_for_types_strv ()

-
EpcServiceMonitor*  epc_service_monitor_new_for_types_strv
-                                                        (const gchar *domain,
-                                                         gchar **types);
-

-Creates a new service monitor watching the specified domain for the -service-types listed. Passing NULL for domain monitors the local network. -Passing an empty service list requests monitoring of all service-types -supported by the library (see epc_service_type_list_supported()). -

-

-See also: epc_service_monitor_new_for_types()

-

-

-
-- - - - - - - - - - - - - - -

domain :

 the DNS domain to monitor, or NULL -

types :

 a NULL terminated list of service types to monitor -

Returns :

 The newly created service monitor. -
-
-
-
-

epc_service_monitor_set_skip_our_own ()

-
void                epc_service_monitor_set_skip_our_own
-                                                        (EpcServiceMonitor *monitor,
-                                                         gboolean setting);
-

-Updates the "skip-our-own" property.

-

-

-
-- - - - - - - - - - -

monitor :

 a EpcServiceMonitor -

setting :

 the new setting -
-
-
-
-

epc_service_monitor_get_skip_our_own ()

-
gboolean            epc_service_monitor_get_skip_our_own
-                                                        (EpcServiceMonitor *monitor);
-

-Queries the current value of the "skip-our-own" property.

-

-

-
-- - - - - - - - - - -

monitor :

 a EpcServiceMonitor -

Returns :

 The current value of the "skip-our-own" property -
-
-
-
-

Property Details

-
-

The "application" property

-
  "application"              gchar*                : Read / Write / Construct Only
-

The application to monitor.

-

Default value: NULL

-
-
-
-

The "domain" property

-
  "domain"                   gchar*                : Read / Write / Construct Only
-

The DNS domain to monitor.

-

Default value: NULL

-
-
-
-

The "service-types" property

-
  "service-types"            GStrv*                : Read / Write / Construct Only
-

The DNS-SD services types to watch.

-
-
-
-

The "skip-our-own" property

-
  "skip-our-own"             gboolean              : Read / Write / Construct
-

Skip services of the current application.

-

Default value: FALSE

-
-
-
-

Signal Details

-
-

The "scanning-done" signal

-
void                user_function                      (EpcServiceMonitor *monitor,
-                                                        gchar             *type,
-                                                        gpointer           user_data)      : Run First
-

-This signal is emitted when active scanning as finished and most certainly -no new services will be detected for some time. Can be used for instance -to hide an progress indicator.

-

-

-
-- - - - - - - - - - - - - - -

monitor :

 a EpcServiceMonitor -

type :

 the service type watched -

user_data :

user data set when the signal handler was connected.
-
-
-
-

The "service-found" signal

-
void                user_function                      (EpcServiceMonitor *monitor,
-                                                        gchar             *name,
-                                                        EpcServiceInfo    *info,
-                                                        gpointer           user_data)      : Run First
-

-This signal is emitted when a new service was found.

-

-

-
-- - - - - - - - - - - - - - - - - - -

monitor :

 a EpcServiceMonitor -

name :

 name of the service removed -

info :

 a description of the service found -

user_data :

user data set when the signal handler was connected.
-
-
-
-

The "service-removed" signal

-
void                user_function                      (EpcServiceMonitor *monitor,
-                                                        gchar             *name,
-                                                        gchar             *type,
-                                                        gpointer           user_data)      : Run First
-

-This signal is emitted when a previously known service disappears.

-

-

-
-- - - - - - - - - - - - - - - - - - -

monitor :

 a EpcServiceMonitor -

name :

 name of the service removed -

type :

 the service type watched -

user_data :

user data set when the signal handler was connected.
-
-
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/index.html libepc-0.4.2/docs/reference/libepc/html/index.html --- libepc-0.3.11/docs/reference/libepc/html/index.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/index.html 2011-10-13 14:52:15.000000000 +0000 @@ -7,21 +7,16 @@ - + - - - - - -
+

Copyright © 2007, 2008 Openismus GmbH

-
+

This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -47,7 +42,7 @@

-
+

Abstract

The Easy Publish and Consume library provides an easy method to: @@ -79,61 +74,61 @@

Consuming
-EpcConsumer — lookup published values +EpcConsumer — lookup published values
-EpcProtocol — transport protocols +EpcProtocol — transport protocols
Publishing
-EpcAuthContext — manage authentication +EpcAuthContext — manage authentication
-EpcContents — custom contents +EpcContents — custom contents
-EpcPublisher — easily publish values +EpcPublisher — easily publish values
DNS-SD Support
-EpcDispatcher — publish DNS-SD services +EpcDispatcher — publish DNS-SD services
-EpcServiceInfo — DNS-SD service descriptions +EpcServiceInfo — DNS-SD service descriptions
-EpcServiceMonitor — find DNS-SD services +EpcServiceMonitor — find DNS-SD services
-EpcServiceType — service type details +EpcServiceType — service type details
Widgets
-EpcPasswordDialog — common password dialog +EpcPasswordDialog — common password dialog
-EpcProgressWindow — provide feedback during lengthly operations +EpcProgressWindow — provide feedback during lengthly operations
Internal API
-EpcShell — library management functions +EpcShell — library management functions
-EpcTls — TLS support +EpcTls — TLS support
- Generated by GTK-Doc V1.11
+ Generated by GTK-Doc V1.18.1
- + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/index.sgml libepc-0.4.2/docs/reference/libepc/html/index.sgml --- libepc-0.3.11/docs/reference/libepc/html/index.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/index.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -1,309 +1,332 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libepc-0.3.11/docs/reference/libepc/html/internal-api.html libepc-0.4.2/docs/reference/libepc/html/internal-api.html --- libepc-0.3.11/docs/reference/libepc/html/internal-api.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/internal-api.html 2011-10-13 14:52:15.000000000 +0000 @@ -6,33 +6,28 @@ - - - + + + - - - - - - + - + -
+

Internal API

-EpcShell — library management functions +EpcShell — library management functions
-EpcTls — TLS support +EpcTls — TLS support

@@ -42,6 +37,6 @@

- Generated by GTK-Doc V1.11
+ Generated by GTK-Doc V1.18.1
- + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-auth-context.html libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-auth-context.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-auth-context.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-auth-context.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,405 @@ + + + + +EpcAuthContext + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcAuthContext

+

EpcAuthContext — manage authentication

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc/publish.h>
+
+enum                EpcAuthFlags;
+gboolean            (*EpcAuthHandler)                   (EpcAuthContext *context,
+                                                         const gchar *username,
+                                                         gpointer user_data);
+                    EpcAuthContext;
+gboolean            epc_auth_context_check_password     (const EpcAuthContext *context,
+                                                         const gchar *password);
+const gchar *       epc_auth_context_get_key            (const EpcAuthContext *context);
+const gchar *       epc_auth_context_get_password       (const EpcAuthContext *context);
+EpcPublisher *      epc_auth_context_get_publisher      (const EpcAuthContext *context);
+
+GFlagsClass *       epc_auth_flags_get_class            (void);
+const gchar *       epc_auth_flags_to_string            (EpcAuthFlags value);
+
+
+
+

Object Hierarchy

+
+  GFlags
+   +----EpcAuthFlags
+
+
+
+

Description

+

+With each request the EpcPublisher verifies access authorization by calling +the EpcAuthHandler registered for the key in question, if any. Information about +that process is stored in the EpcAuthContext structure. +

+

+To register an authentication handler call epc_publisher_set_auth_handler(): +

+

+

+
+

Example 3. Register an authentication handler

+
+ + + + + + + + 
1
+2
epc_publisher_set_auth_handler (publisher, "sensitive-key",
+                                my_auth_handler, my_object);
+
+ +
+


+

+

+To verify that the user password provided password matches +the expected one use epc_auth_context_check_password(): +

+

+

+
+

Example 4. Verify a password

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
static gboolean
+my_auth_handler (EpcAuthContext *context,
+                 const gchar    *username,
+                 gpointer        user_data)
+{
+  MyObject *self = user_data;
+  const gchar *expected_password;
+  const gchar *requested_key;
+
+  requested_key = epc_auth_context_get_key (context);
+  expected_password = lookup_password (self, requested_key);
+
+  return epc_auth_context_check_password (context, expected_password);
+}
+
+ +
+


+

+
+
+

Details

+
+

enum EpcAuthFlags

+
typedef enum {
+  EPC_AUTH_DEFAULT =                     0,
+  EPC_AUTH_PASSWORD_TEXT_NEEDED =       (1 << 0)
+} EpcAuthFlags;
+
+

+These flags specify the authentication behaviour of an EpcPublisher. +

+
++ + + + + + + + + + +

EPC_AUTH_DEFAULT

The default authentication settings. +

EPC_AUTH_PASSWORD_TEXT_NEEDED

Set this flag when your EpcAuthFlags +needs the supplied password in plain text - for instance to pass it to a +database server used by your application. This flag replaces the secure Digest +authentication scheme with the insecure Basic authentication scheme. +Therefore this setting is valid only when the publisher's transport +protocol is EPC_PROTOCOL_HTTPS (secure http). +
+
+
+
+

EpcAuthHandler ()

+
gboolean            (*EpcAuthHandler)                   (EpcAuthContext *context,
+                                                         const gchar *username,
+                                                         gpointer user_data);
+

+Functions implementing this callback shall return TRUE when the +credentials provided by the authentication request grant access +to the resource described by context. +

+

+The username is NULL when no creditials were passed, and anonymous access +is tried. +

+

+See also epc_publisher_set_auth_flags. When EPC_AUTH_DEFAULT is used, +you should call epc_auth_context_check_password +to verify that the password passed in the request matches the known password +for that user. In this case there is no way to retrieve the password from +the EpcAuthContext because the network protocol transfers just a hash code, +not the actual password. +

+

+However, when EPC_AUTH_PASSWORD_TEXT_NEEDED is used, you should call +epc_auth_context_get_password() and then do your own authentication check. +For instance, you might need to delegate the authentication to some other +code or server, such as a database server. +

+
++ + + + + + + + + + + + + + + + + + +

context :

the EpcAuthContext +

username :

the username provided for authentication, or NULL +

user_data :

user data set when the signal handler was installed

Returns :

 +TRUE when access is granted, and FALSE otherwise.
+
+
+
+

EpcAuthContext

+
typedef struct _EpcAuthContext EpcAuthContext;
+

+This data structure describes a pending authentication request +which shall be verified by an EpcAuthHandler installed by +epc_publisher_set_auth_handler(). +

+

+

+
+

Note

+

+ There is no way to retrieve the password from the EpcAuthContext, as + the network protocol transfers just a hash code, not the actual password. +

+
+

+

+
+
+
+

epc_auth_context_check_password ()

+
gboolean            epc_auth_context_check_password     (const EpcAuthContext *context,
+                                                         const gchar *password);
+

+Verifies that the password supplied with the network request matches +the password the application expects. There is no way to retrieve the +password from the EpcAuthContext, as the network protocol transfers +just a hash code, not the actual password. +

+
++ + + + + + + + + + + + + + +

context :

a EpcAuthContext +

password :

the expected password

Returns :

 +TRUE when the sent password matches, or FALSE otherwise.
+
+
+
+

epc_auth_context_get_key ()

+
const gchar *       epc_auth_context_get_key            (const EpcAuthContext *context);
+

+Queries the resource key associated with the authentication context. +

+
++ + + + + + + + + + +

context :

a EpcAuthContext +

Returns :

The resource key.
+
+
+
+

epc_auth_context_get_password ()

+
const gchar *       epc_auth_context_get_password       (const EpcAuthContext *context);
+

+Queries the password sent for the authentication context when Basic +authentication was allowed for the context, and NULL otherwise. +

+

+See also: EPC_AUTH_PASSWORD_TEXT_NEEDED +

+
++ + + + + + + + + + +

context :

a EpcAuthContext +

Returns :

The password sent, or NULL.
+
+
+
+

epc_auth_context_get_publisher ()

+
EpcPublisher *      epc_auth_context_get_publisher      (const EpcAuthContext *context);
+

+Queries the EpcPublisher owning the authentication context. +

+
++ + + + + + + + + + +

context :

a EpcAuthContext +

Returns :

The owning EpcPublisher.
+
+
+
+

epc_auth_flags_get_class ()

+
GFlagsClass *       epc_auth_flags_get_class            (void);
+

+Retrieves the GFlagsClass describing the EpcAuthFlags flags. +

+
++ + + + +

Returns :

The GFlagsClass describing EpcAuthFlags.
+
+
+
+

epc_auth_flags_to_string ()

+
const gchar *       epc_auth_flags_to_string            (EpcAuthFlags value);
+

+Retrieves the name of a EpcAuthFlags value, or NULL when value is invalid. +

+
++ + + + + + + + + + +

value :

a EpcAuthFlags value

Returns :

The string representation of value, or NULL.
+
+
+
+

See Also

+EpcPublisher +
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-consumer.html libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-consumer.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-consumer.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-consumer.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,908 @@ + + + + +EpcConsumer + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcConsumer

+

EpcConsumer — lookup published values

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc/consumer.h>
+
+#define             EPC_HTTP_ERROR
+                    EpcConsumerPrivate;
+struct              EpcConsumerClass;
+struct              EpcConsumer;
+
+EpcConsumer *       epc_consumer_new                    (const EpcServiceInfo *service);
+EpcConsumer *       epc_consumer_new_for_name           (const gchar *name);
+EpcConsumer *       epc_consumer_new_for_name_full      (const gchar *name,
+                                                         const gchar *application,
+                                                         const gchar *domain);
+
+EpcProtocol         epc_consumer_get_protocol           (EpcConsumer *consumer);
+const gchar *       epc_consumer_get_password           (EpcConsumer *consumer);
+const gchar *       epc_consumer_get_username           (EpcConsumer *consumer);
+
+void                epc_consumer_set_protocol           (EpcConsumer *consumer,
+                                                         EpcProtocol protocol);
+void                epc_consumer_set_password           (EpcConsumer *consumer,
+                                                         const gchar *password);
+void                epc_consumer_set_username           (EpcConsumer *consumer,
+                                                         const gchar *username);
+
+gboolean            epc_consumer_resolve_publisher      (EpcConsumer *consumer,
+                                                         guint timeout);
+gboolean            epc_consumer_is_publisher_resolved  (EpcConsumer *consumer);
+gpointer            epc_consumer_lookup                 (EpcConsumer *consumer,
+                                                         const gchar *key,
+                                                         gsize *length,
+                                                         GError **error);
+GList *             epc_consumer_list                   (EpcConsumer *consumer,
+                                                         const gchar *pattern,
+                                                         GError **error);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----EpcConsumer
+
+
+
+

Properties

+
+  "application"              gchar*                : Read / Write / Construct Only
+  "domain"                   gchar*                : Read / Write / Construct Only
+  "hostname"                 gchar*                : Read / Write / Construct Only
+  "name"                     gchar*                : Read / Write / Construct Only
+  "password"                 gchar*                : Read / Write / Construct
+  "path"                     gchar*                : Read / Write / Construct Only
+  "port"                     gint                  : Read / Write / Construct Only
+  "protocol"                 EpcProtocol           : Read / Write / Construct
+  "username"                 gchar*                : Read / Write / Construct
+
+
+
+

Signals

+
+  "authenticate"                                   : Run Last
+  "publisher-resolved"                             : Run First
+
+
+
+

Description

+

+The EpcConsumer object is used to lookup values published by an +EpcPublisher service. Currently HTTP is used for communication. +To find a publisher, use DNS-SD (also known as ZeroConf) to +list EPC_PUBLISHER_SERVICE_TYPE services. +

+

+

+
+

Example 1. Lookup a value

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
service_name = choose_recently_used_service ();
+
+if (service_name)
+  consumer = epc_consumer_new_for_name (service_name);
+else
+  consumer = epc_consumer_new (your_app_find_service ());
+
+value = epc_consumer_lookup (consumer, "glom-settings", NULL, &error);
+g_object_unref (consumer);
+
+your_app_consume_value (value);
+g_free (value);
+
+ +
+


+

+

+

+
+

Example 2. Find a publisher

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
dialog = aui_service_dialog_new ("Choose a Service", main_window,
+                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                 GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT,
+                                 NULL);
+
+aui_service_dialog_set_browse_service_types (AUI_SERVICE_DIALOG (dialog),
+                                             EPC_SERVICE_TYPE_HTTPS,
+                                             EPC_SERVICE_TYPE_HTTP,
+                                             NULL);
+
+ aui_service_dialog_set_service_type_name (AUI_SERVICE_DIALOG (dialog),
+                                         EPC_SERVICE_TYPE_HTTPS,
+                                         "Secure Transport");
+ aui_service_dialog_set_service_type_name (AUI_SERVICE_DIALOG (dialog),
+                                         EPC_SERVICE_TYPE_HTTP,
+                                         "Insecure Transport");
+
+ if (GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog)))
+{
+   EpcServiceInfo *service =
+     epc_service_info_new (aui_service_dialog_get_service_type (AUI_SERVICE_DIALOG (dialog)),
+                           aui_service_dialog_get_host_name    (AUI_SERVICE_DIALOG (dialog)),
+                           aui_service_dialog_get_port         (AUI_SERVICE_DIALOG (dialog)),
+                           aui_service_dialog_get_txt_data     (AUI_SERVICE_DIALOG (dialog)));
+
+   consumer = epc_consumer_new (service);
+   epc_service_info_unref (service);
+   ...
+}
+
+ +
+


+

+
+
+

Details

+
+

EPC_HTTP_ERROR

+
#define EPC_HTTP_ERROR              (epc_http_error_quark())
+
+

+Error domain for HTTP operations. Errors in this domain will +be from the SoupKnownStatusCode enumeration. See GError for +information on error domains. +

+
+
+
+

EpcConsumerPrivate

+
typedef struct _EpcConsumerPrivate EpcConsumerPrivate;
+

+Private fields of the EpcConsumer class. +

+
+
+
+

struct EpcConsumerClass

+
struct EpcConsumerClass {
+  void (*authenticate)       (EpcConsumer  *consumer,
+                              const gchar  *realm);
+
+  void (*publisher_resolved) (EpcConsumer  *consumer,
+                              EpcProtocol   protocol,
+                              const gchar  *hostname,
+                              guint         port);
+};
+
+

+Virtual methods of the EpcConsumer class. +

+
++ + + + + + + + + + +

authenticate ()

virtual method of the "authenticate" signal

publisher_resolved ()

virtual method of the "publisher-resolved" signal
+
+
+
+

struct EpcConsumer

+
struct EpcConsumer;
+

+Public fields of the EpcConsumer class. +

+
+
+
+

epc_consumer_new ()

+
EpcConsumer *       epc_consumer_new                    (const EpcServiceInfo *service);
+

+Creates a new EpcConsumer object and associates it with a known +EpcPublisher. The service description can be retrieved, for instance, +by using EpcServiceMonitor, or by using the service selection dialog +of avahi-ui (AuiServiceDialog). +

+

+The connection is not established until functions like epc_consumer_lookup(), +epc_consumer_list() or epc_consumer_resolve_publisher are called. +

+
++ + + + + + + + + + +

service :

the publisher's service description

Returns :

The newly created EpcConsumer object
+
+
+
+

epc_consumer_new_for_name ()

+
EpcConsumer *       epc_consumer_new_for_name           (const gchar *name);
+

+Creates a new EpcConsumer object and associates it with the EpcPublisher +announcing itself with name on the local network. The DNS-SD service name +used for searching the EpcPublisher is derived from the application's +program name as returned by g_get_prgname(). +

+

+See epc_consumer_new_for_name_full() for additional notes +and a method allowing better control over the search process. +

+
++ + + + + + + + + + +

name :

the service name of an EpcPublisher +

Returns :

The newly created EpcConsumer object
+
+
+
+

epc_consumer_new_for_name_full ()

+
EpcConsumer *       epc_consumer_new_for_name_full      (const gchar *name,
+                                                         const gchar *application,
+                                                         const gchar *domain);
+

+Creates a new EpcConsumer object and associates it with the EpcPublisher +announcing itself with name on domain. The DNS-SD service of the +EpcPublisher is derived from application using epc_service_type_new(). +

+

+

+
+

Note

+

+ This function shall be used to re-connect to a formerly used EpcPublisher, + selected for instance from a list for recently used services. Therefore + using epc_consumer_new_for_name_full() is a quite optimistic approach for + contacting a publisher: You call it without really knowing if the + publisher you requested really exists. You only know that it existed + in the past when you added it to your list of recently used publishers, + but you do not know if it still exists. +

+

+ To let your users choose from an up-to-date service list, you have to + use a dynamic service list as provided by avahi-ui for choosing a service + and pass the information this widget provides (hostname, port, protocol) + to epc_consumer_new(). +

+
+

+

+

+

+
+

Note

+

+ The connection is not established until a function retrieving + data, like for instance epc_consumer_lookup(), is called. +

+

+ Explicitly call epc_consumer_resolve_publisher() or connect to + the "publisher-resolved" signal, when your application + needs reliable information about the existance of the EpcPublisher + described by name. +

+
+

+

+
++ + + + + + + + + + + + + + + + + + +

name :

the service name of an EpcPublisher +

application :

the publisher's program name

domain :

the DNS domain of the EpcPublisher +

Returns :

The newly created EpcConsumer object
+
+
+
+

epc_consumer_get_protocol ()

+
EpcProtocol         epc_consumer_get_protocol           (EpcConsumer *consumer);
+

+Queries the transport protocol to use for contacting the publisher. +See "protocol" for details. +

+
++ + + + + + + + + + +

consumer :

a EpcConsumer +

Returns :

The transport protocol this consumer uses.
+
+
+
+

epc_consumer_get_password ()

+
const gchar *       epc_consumer_get_password           (EpcConsumer *consumer);
+

+Queries the password used for authentication. +See "password" for details. +

+
++ + + + + + + + + + +

consumer :

a EpcConsumer +

Returns :

The password this consumer uses.
+
+
+
+

epc_consumer_get_username ()

+
const gchar *       epc_consumer_get_username           (EpcConsumer *consumer);
+

+Queries the user name used for authentication. +See "username" for details. +

+
++ + + + + + + + + + +

consumer :

a EpcConsumer +

Returns :

The user name this consumer uses.
+
+
+
+

epc_consumer_set_protocol ()

+
void                epc_consumer_set_protocol           (EpcConsumer *consumer,
+                                                         EpcProtocol protocol);
+

+Changes the transport protocol to use for contacting the publisher. +See "protocol" for details. +

+
++ + + + + + + + + + +

consumer :

a EpcConsumer +

protocol :

the new transport protocol
+
+
+
+

epc_consumer_set_password ()

+
void                epc_consumer_set_password           (EpcConsumer *consumer,
+                                                         const gchar *password);
+

+Changes the password used for authentication. +See "password" for details. +

+
++ + + + + + + + + + +

consumer :

a EpcConsumer +

password :

the new password, or NULL +
+
+
+
+

epc_consumer_set_username ()

+
void                epc_consumer_set_username           (EpcConsumer *consumer,
+                                                         const gchar *username);
+

+Changes the user name used for authentication. +See "username" for details. +

+
++ + + + + + + + + + +

consumer :

a EpcConsumer +

username :

the new user name, or NULL +
+
+
+
+

epc_consumer_resolve_publisher ()

+
gboolean            epc_consumer_resolve_publisher      (EpcConsumer *consumer,
+                                                         guint timeout);
+

+Waits until the consumer has found its EpcPublisher. +A timeout of 0 requests infinite waiting. +

+

+See also: "publisher-resolved" +

+
++ + + + + + + + + + + + + + +

consumer :

a EpcConsumer +

timeout :

the amount of milliseconds to wait

Returns :

 +TRUE when a publisher has been found, FALSE otherwise.
+
+
+
+

epc_consumer_is_publisher_resolved ()

+
gboolean            epc_consumer_is_publisher_resolved  (EpcConsumer *consumer);
+

+Checks if the host name of this consumer's EpcPublisher +has been resolved already. +

+

+See also: epc_consumer_resolve_publisher(), "publisher-resolved" +

+
++ + + + + + + + + + +

consumer :

a EpcConsumer +

Returns :

 +TRUE when the host name has been resolved, and FALSE otherwise.
+
+
+
+

epc_consumer_lookup ()

+
gpointer            epc_consumer_lookup                 (EpcConsumer *consumer,
+                                                         const gchar *key,
+                                                         gsize *length,
+                                                         GError **error);
+

+If the call was successful, this returns a newly allocated buffer containing +the value the publisher provides for key. If the call was not +successful it returns NULL and sets error. The error domain is +EPC_HTTP_ERROR. Error codes are taken from the SoupKnownStatusCode +enumeration. +

+

+For instance, the error code will be SOUP_STATUS_FORBIDDEN if +authentication failed (see epc_publisher_set_auth_handler()). You must +include libsoup/soup-status.h +to use this error code. +

+

+The returned buffer should be freed when no longer needed. +

+

+See the description of EpcPublisher for discussion of NULL values. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

consumer :

the consumer

key :

unique key of the value

length :

location to store length in bytes of the contents, or NULL +

error :

return location for a GError, or NULL +

Returns :

A copy of the publisher's value for the the requested key, +or NULL when an error occurred.
+
+
+
+

epc_consumer_list ()

+
GList *             epc_consumer_list                   (EpcConsumer *consumer,
+                                                         const gchar *pattern,
+                                                         GError **error);
+

+Matches published keys against patterns containing '*' (wildcard) and '?' +(joker). Passing NULL as pattern is equivalent to passing "*" and returns +all published keys. This function is useful to find and select dynamically +published values. See GPatternSpec for information about glob-style +patterns. +

+

+If the call was successful, a list of keys matching pattern is returned. +If the call was not successful, it returns NULL and sets error. +The error domain is EPC_HTTP_ERROR. Error codes are taken from the +SoupKnownStatusCode enumeration. +

+

+The returned list should be freed when no longer needed: +

+

+

+
+ g_list_foreach (keys, (GFunc) g_free, NULL);
+ g_list_free (keys);
+
+

+

+

+See also epc_publisher_list() for creating custom listings. +

+
++ + + + + + + + + + + + + + + + + + +

consumer :

a EpcConsumer +

pattern :

a glob-style pattern, or NULL +

error :

return location for a GError, or NULL +

Returns :

A newly allocated list of keys, or NULL when an error occurred.
+
+
+
+

Property Details

+
+

The "application" property

+
  "application"              gchar*                : Read / Write / Construct Only
+

Program name the publisher to use.

+

Default value: NULL

+
+
+
+

The "domain" property

+
  "domain"                   gchar*                : Read / Write / Construct Only
+

DNS domain of the publisher to use.

+

Default value: NULL

+
+
+
+

The "hostname" property

+
  "hostname"                 gchar*                : Read / Write / Construct Only
+

Host name of the publisher to use.

+

Default value: NULL

+
+
+
+

The "name" property

+
  "name"                     gchar*                : Read / Write / Construct Only
+

Service name of the publisher to use.

+

Default value: NULL

+
+
+
+

The "password" property

+
  "password"                 gchar*                : Read / Write / Construct
+

The password to use for authentication.

+

Default value: NULL

+
+
+
+

The "path" property

+
  "path"                     gchar*                : Read / Write / Construct Only
+

The path the publisher uses for contents.

+

Default value: "/contents"

+
+
+
+

The "port" property

+
  "port"                     gint                  : Read / Write / Construct Only
+

TCP/IP port of the publisher to use.

+

Allowed values: [0,65535]

+

Default value: 0

+
+
+
+

The "protocol" property

+
  "protocol"                 EpcProtocol           : Read / Write / Construct
+

The transport protocol to use for contacting the publisher.

+

Default value: EPC_PROTOCOL_UNKNOWN

+
+
+
+

The "username" property

+
  "username"                 gchar*                : Read / Write / Construct
+

The user name to use for authentication.

+

Default value: NULL

+
+
+
+

Signal Details

+
+

The "authenticate" signal

+
gboolean            user_function                      (EpcConsumer *consumer,
+                                                        gchar       *realm,
+                                                        gpointer     user_data)      : Run Last
+

+Emitted when the EpcConsumer requires authentication. The signal +handler should provide these credentials, which may come from the +user or from cached information by setting the "username" +and "password" properties. When providing credentials +the signal handler should return TRUE to stop signal emission. +

+

+If the provided credentials fail then the signal will be emmitted again. +

+
++ + + + + + + + + + + + + + + + + + +

consumer :

the EpcConsumer emitting the signal

realm :

the realm being authenticated to

user_data :

user data set when the signal handler was connected.

Returns :

 +TRUE when the signal handler handled the authentication request, +and FALSE otherwise.
+
+
+
+

The "publisher-resolved" signal

+
void                user_function                      (EpcConsumer *consumer,
+                                                        EpcProtocol  protocol,
+                                                        gchar       *hostname,
+                                                        guint        port,
+                                                        gpointer     user_data)      : Run First
+

+This signal is emitted when a EpcConsumer created with +epc_consumer_new_for_name() or epc_consumer_new_for_name_full +has found its EpcPublisher. +

+

+Publisher detection is integrated with the GLib main loop. Therefore the +signal will not be emitted before a main loop is run (g_main_loop_run(), +gtk_main()). So to reliably consume this signal connect to it directly +after creating the EpcConsumer. +

+

+See also: epc_consumer_resolve_publisher(), epc_consumer_is_pulisher_resolved +

+
++ + + + + + + + + + + + + + + + + + + + + + +

consumer :

the EpcConsumer emitting the signal

protocol :

the publisher's transport protocol

hostname :

the publisher's host name

port :

the publisher's TCP/IP port

user_data :

user data set when the signal handler was connected.
+
+
+
+

See Also

+EpcPublisher +
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-contents.html libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-contents.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-contents.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-contents.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,479 @@ + + + + +EpcContents + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcContents

+

EpcContents — custom contents

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc/contents.h>
+
+gboolean            (*EpcContentsReadFunc)              (EpcContents *contents,
+                                                         gpointer buffer,
+                                                         gsize *length,
+                                                         gpointer user_data);
+                    EpcContents;
+EpcContents *       epc_contents_new                    (const gchar *type,
+                                                         gpointer data,
+                                                         gssize length,
+                                                         GDestroyNotify destroy_data);
+EpcContents *       epc_contents_new_dup                (const gchar *type,
+                                                         gconstpointer data,
+                                                         gssize length);
+EpcContents *       epc_contents_ref                    (EpcContents *contents);
+void                epc_contents_unref                  (EpcContents *contents);
+
+gconstpointer       epc_contents_get_data               (EpcContents *contents,
+                                                         gsize *length);
+const gchar *       epc_contents_get_mime_type          (EpcContents *contents);
+
+EpcContents *       epc_contents_stream_new             (const gchar *type,
+                                                         EpcContentsReadFunc callback,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy_data);
+gconstpointer       epc_contents_stream_read            (EpcContents *contents,
+                                                         gsize *length);
+gboolean            epc_contents_is_stream              (EpcContents *contents);
+
+
+
+

Description

+

+EpcContents is a reference counted structure for storing custom contents. +To publish custom content call epc_publisher_add_handler() to register a +EpcContentsHandler like this: +

+

+

+
+

Example 5. A custom contents handler

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
static EpcContents*
+timestamp_handler (EpcPublisher *publisher G_GNUC_UNUSED,
+                   const gchar  *key G_GNUC_UNUSED,
+                   gpointer      data)
+{
+  time_t now = time (NULL);
+  struct tm *tm = localtime (&now);
+  const gchar *format = data;
+  gsize length = 60;
+  gchar *buffer;
+
+  buffer = g_malloc (length);
+  length = strftime (buffer, length, format, tm);
+
+  return epc_content_new ("text/plain", buffer, length);
+}
+
+ +
+


+

+
+
+

Details

+
+

EpcContentsReadFunc ()

+
gboolean            (*EpcContentsReadFunc)              (EpcContents *contents,
+                                                         gpointer buffer,
+                                                         gsize *length,
+                                                         gpointer user_data);
+

+This callback is used to retrieve the next chunk of data for a streaming +contents buffer created with epc_contents_stream_read. +

+

+Return FALSE when the buffer has reached its end, and no more data is +available. Also return FALSE, when the buffer size passed in length is +not sufficient. Copy your minimal buffer size to length in that situation. +

+

+The library might pass NULL for buffer on the first call to start buffer +size negotation. +

+

+See also: epc_contents_stream_new, epc_contents_stream_read +

+
++ + + + + + + + + + + + + + + + + + + + + + +

contents :

a EpcContents buffer

buffer :

a location for storing the contents, or NULL +

length :

a location for passing and storing the contents length in bytes.

user_data :

the user_data passed to epc_contents_stream_new +

Returns :

Returns TRUE when the next chunk could be read, and FALSE on error.
+
+
+
+

EpcContents

+
typedef struct _EpcContents EpcContents;
+

+A reference counted buffer for storing contents to deliver by the +EpcPublisher. Use epc_contents_new() or epc_contents_new_dup to create +instances of this buffer. +

+
+
+
+

epc_contents_new ()

+
EpcContents *       epc_contents_new                    (const gchar *type,
+                                                         gpointer data,
+                                                         gssize length,
+                                                         GDestroyNotify destroy_data);
+

+Creates a new EpcContents buffer, and takes ownership of the data passed. +Passing NULL for type is equivalent to passing "application/octet-stream". +

+

+See also: epc_contents_new_dup, epc_contents_stream_new +

+
++ + + + + + + + + + + + + + + + + + + + + + +

type :

the MIME type of this contents, or NULL +

data :

static contents for the buffer

length :

the contents length in bytes, or -1 if data is a null-terminated string.

destroy_data :

This function will be called to free data when it is no longer needed.

Returns :

The newly created EpcContents buffer.
+
+
+
+

epc_contents_new_dup ()

+
EpcContents *       epc_contents_new_dup                (const gchar *type,
+                                                         gconstpointer data,
+                                                         gssize length);
+

+Creates a new EpcContents buffer, and copies the data passed. +Passing NULL for type is equivalent to passing "application/octet-stream". +

+

+See also: epc_contents_new, epc_contents_stream_new +

+
++ + + + + + + + + + + + + + + + + + +

type :

the MIME type of this contents, or NULL +

data :

static contents for the buffer

length :

the content's length in bytes, or -1 if data is a null-terminated string.

Returns :

The newly created EpcContents buffer.
+
+
+
+

epc_contents_ref ()

+
EpcContents *       epc_contents_ref                    (EpcContents *contents);
+

+Increases the reference count of contents. +

+
++ + + + + + + + + + +

contents :

a EpcContents buffer

Returns :

the same contents buffer.
+
+
+
+

epc_contents_unref ()

+
void                epc_contents_unref                  (EpcContents *contents);
+

+Decreases the reference count of contents. +When its reference count drops to 0, the buffer is released +(i.e. its memory is freed). +

+
++ + + + +

contents :

a EpcContents buffer
+
+
+
+

epc_contents_get_data ()

+
gconstpointer       epc_contents_get_data               (EpcContents *contents,
+                                                         gsize *length);
+

+Retrieves the contents of a static contents buffer created with +epc_contents_new(). Any other buffer returns NULL. The data returned +is owned by the EpcContents buffer and must not be freeded. +

+

+See also: epc_contents_stream_read(). +

+
++ + + + + + + + + + + + + + +

contents :

a EpcContents buffer

length :

a location for storing the contents length

Returns :

Returns the static buffer contents, or NULL. This should not be freed or modified.
+
+
+
+

epc_contents_get_mime_type ()

+
const gchar *       epc_contents_get_mime_type          (EpcContents *contents);
+

+Queries the MIME type associated with the buffer. Returns the MIME +type specified for epc_contents_new() or epc_contents_stream_new, +or "application/octet-stream" when NULL was passed. +

+
++ + + + + + + + + + +

contents :

a EpcContents buffer

Returns :

Returns the MIME type of the buffer.
+
+
+
+

epc_contents_stream_new ()

+
EpcContents *       epc_contents_stream_new             (const gchar *type,
+                                                         EpcContentsReadFunc callback,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy_data);
+

+Creates a new EpcContents buffer for large contents like movie files, +which cannot, or should be delivered as solid blob of data. +

+

+Passing NULL for type is equivalent to passing "application/octet-stream". +

+

+See also: epc_contents_stream_read(), epc_contents_is_stream +

+
++ + + + + + + + + + + + + + + + + + + + + + +

type :

the MIME type of this contents, or NULL +

callback :

the function for retrieving chunks

user_data :

data which will be passed to callback +

destroy_data :

This function will be called to free user_data when it is no longer needed.

Returns :

The newly created EpcContents buffer.
+
+
+
+

epc_contents_stream_read ()

+
gconstpointer       epc_contents_stream_read            (EpcContents *contents,
+                                                         gsize *length);
+

+Retrieves the next chunk of data for a streaming contents buffer created +with epc_contents_stream_read(). NULL is returned, when the buffer has +reached its end, or isn't a streaming contents buffer. +

+

+The data returned is owned by the EpcContents buffer and must not be +freeded by the called. Make sure to copy the returned data before the +function again, as repeated calls to the function might return the +same buffer, but filled with new data. +

+

+See also: epc_contents_stream_new(), epc_contents_is_stream +

+
++ + + + + + + + + + + + + + +

contents :

a EpcContents buffer

length :

a location for storing the contents length

Returns :

Returns the next chunk of data, or NULL. The should not be freed or modified.
+
+
+
+

epc_contents_is_stream ()

+
gboolean            epc_contents_is_stream              (EpcContents *contents);
+

+Checks if stream routines can be used for retreiving +the contents of the buffer. +

+

+See also: epc_contents_stream_new(), epc_contents_stream_read +

+
++ + + + + + + + + + +

contents :

a EpcContents buffer

Returns :

Returns TRUE when stream routines have to be used.
+
+
+
+

See Also

+EpcPublisher +
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0.devhelp libepc-0.4.2/docs/reference/libepc/html/libepc-1.0.devhelp --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0.devhelp 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0.devhelp 1970-01-01 00:00:00.000000000 +0000 @@ -1,245 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0.devhelp2 libepc-0.4.2/docs/reference/libepc/html/libepc-1.0.devhelp2 --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0.devhelp2 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0.devhelp2 2011-10-13 14:52:15.000000000 +0000 @@ -3,254 +3,254 @@ - - + + - - - + + + - - - - + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-dispatcher.html libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-dispatcher.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-dispatcher.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-dispatcher.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,751 @@ + + + + +EpcDispatcher + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcDispatcher

+

EpcDispatcher — publish DNS-SD services

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc/dispatcher.h>
+
+enum                EpcAddressFamily;
+enum                EpcCollisionHandling;
+                    EpcDispatcherPrivate;
+struct              EpcDispatcherClass;
+struct              EpcDispatcher;
+EpcDispatcher *     epc_dispatcher_new                  (const gchar *name);
+gboolean            epc_dispatcher_run                  (EpcDispatcher *dispatcher,
+                                                         GError **error);
+void                epc_dispatcher_reset                (EpcDispatcher *dispatcher);
+void                epc_dispatcher_add_service          (EpcDispatcher *dispatcher,
+                                                         EpcAddressFamily protocol,
+                                                         const gchar *type,
+                                                         const gchar *domain,
+                                                         const gchar *host,
+                                                         guint16 port,
+                                                         ...);
+void                epc_dispatcher_add_service_subtype  (EpcDispatcher *dispatcher,
+                                                         const gchar *type,
+                                                         const gchar *subtype);
+
+void                epc_dispatcher_set_collision_handling
+                                                        (EpcDispatcher *dispatcher,
+                                                         EpcCollisionHandling method);
+void                epc_dispatcher_set_cookie           (EpcDispatcher *dispatcher,
+                                                         const gchar *cookie);
+void                epc_dispatcher_set_name             (EpcDispatcher *dispatcher,
+                                                         const gchar *name);
+void                epc_dispatcher_set_service_details  (EpcDispatcher *dispatcher,
+                                                         const gchar *type,
+                                                         ...);
+
+EpcCollisionHandling epc_dispatcher_get_collision_handling
+                                                        (EpcDispatcher *dispatcher);
+const gchar *       epc_dispatcher_get_cookie           (EpcDispatcher *dispatcher);
+const gchar *       epc_dispatcher_get_name             (EpcDispatcher *dispatcher);
+
+GEnumClass *        epc_address_family_get_class        (void);
+const gchar *       epc_address_family_to_string        (EpcAddressFamily value);
+GEnumClass *        epc_collision_handling_get_class    (void);
+const gchar *       epc_collision_handling_to_string    (EpcCollisionHandling value);
+
+
+
+

Object Hierarchy

+
+  GEnum
+   +----EpcAddressFamily
+
+
+  GEnum
+   +----EpcCollisionHandling
+
+
+  GObject
+   +----EpcDispatcher
+
+
+
+

Properties

+
+  "collision-handling"       EpcCollisionHandling  : Read / Write / Construct
+  "cookie"                   gchar*                : Read / Write / Construct
+  "name"                     gchar*                : Read / Write / Construct
+
+
+
+

Description

+

+The EpcDispatcher object provides an easy method for publishing +DNS-SD services. Unlike established APIs like Avahi or HOWL the +EpcDispatcher doesn't expose any state changes reported by the +DNS-SD daemon, but instead tries to handle them automatically. Such state +changes include, for instance, name collisions or a restart of +the DNS-SD daemon. +

+

+

+
+

Example 7. Publish a printing service

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
dispatcher = epc_dispatcher_new ("Dead Tree Desecrator");
+
+epc_dispatcher_add_service (dispatcher, EPC_ADDRESS_IPV4, "_ipp._tcp",
+                            NULL, NULL, 651, "path=/printers", NULL);
+epc_dispatcher_add_service (dispatcher, EPC_ADDRESS_UNSPEC,
+                            "_duplex._sub._printer._tcp",
+                            NULL, NULL, 515, NULL);
+
+ +
+


+

+
+
+

Details

+
+

enum EpcAddressFamily

+
typedef enum {
+  EPC_ADDRESS_UNSPEC = AF_UNSPEC,
+  EPC_ADDRESS_IPV4 = AF_INET,
+  EPC_ADDRESS_IPV6 = AF_INET6
+} EpcAddressFamily;
+
+

+The address family to use for contacting network services. +

+
++ + + + + + + + + + + + + + +

EPC_ADDRESS_UNSPEC

No preferences exist. Use all address families supported. +

EPC_ADDRESS_IPV4

Exclusively use IPv4 for addressing network services. +

EPC_ADDRESS_IPV6

Exclusively use IPv6 for addressing network services. +
+
+
+
+

enum EpcCollisionHandling

+
typedef enum {
+  EPC_COLLISIONS_IGNORE,
+  EPC_COLLISIONS_CHANGE_NAME,
+  EPC_COLLISIONS_UNIQUE_SERVICE
+} EpcCollisionHandling;
+
+

+Various strategies for handling service name collisions. +

+
++ + + + + + + + + + + + + + +

EPC_COLLISIONS_IGNORE

Don't handle collisions at all, just fail silently. +

EPC_COLLISIONS_CHANGE_NAME

Try to announce the service with another name. +

EPC_COLLISIONS_UNIQUE_SERVICE

Defer own service announcement until the other service. +disappears. +
+
+
+
+

EpcDispatcherPrivate

+
typedef struct _EpcDispatcherPrivate EpcDispatcherPrivate;
+

+Private fields of the EpcDispatcher class. +

+
++ +
+
+
+
+

struct EpcDispatcherClass

+
struct EpcDispatcherClass {
+};
+
+

+Virtual methods of the EpcDispatcher class. +

+
+
+
+

struct EpcDispatcher

+
struct EpcDispatcher;
+

+Public fields of the EpcDispatcher class. +

+
+
+
+

epc_dispatcher_new ()

+
EpcDispatcher *     epc_dispatcher_new                  (const gchar *name);
+

+Creates a new EpcDispatcher object for announcing a DNS-SD service. +The service is announced on all network interfaces. +

+

+Call epc_dispatcher_add_service() to actually announce a service. +

+
++ + + + + + + + + + +

name :

the human friendly name of the service

Returns :

the newly created EpcDispatcher object.
+
+
+
+

epc_dispatcher_run ()

+
gboolean            epc_dispatcher_run                  (EpcDispatcher *dispatcher,
+                                                         GError **error);
+

+Starts the Avahi client of the EpcDispatcher. If the +client was not started, the function returns FALSE and sets error. The +error domain is EPC_AVAHI_ERROR. Possible error codes are those of the +Avahi library. +

+
++ + + + + + + + + + + + + + +

dispatcher :

a EpcDispatcher +

error :

return location for a GError, or NULL +

Returns :

 +TRUE when the dispatcher was started successfully, +FALSE if an error occurred.
+
+
+
+

epc_dispatcher_reset ()

+
void                epc_dispatcher_reset                (EpcDispatcher *dispatcher);
+

+Revokes all service announcements of this EpcDispatcher. +

+
++ + + + +

dispatcher :

a EpcDispatcher +
+
+
+
+

epc_dispatcher_add_service ()

+
void                epc_dispatcher_add_service          (EpcDispatcher *dispatcher,
+                                                         EpcAddressFamily protocol,
+                                                         const gchar *type,
+                                                         const gchar *domain,
+                                                         const gchar *host,
+                                                         guint16 port,
+                                                         ...);
+

+Announces a TCP/IP service via DNS-SD. +

+

+The service type shall be a well-known DNS-SD service type as listed on +http://www.dns-sd.org/ServiceTypes.html. This function tries +to announce both the base service type and the sub service type when the +service name contains more than just one dot: Passing "_anon._sub._ftp._tcp" +for @type will announce the services "_ftp._tcp" and "_anon._sub._ftp._tcp". +

+

+The function can be called more than once. Is this necessary when the server +provides different access methods. For instance a web server could provide +HTTP and encrypted HTTPS services at the same time. Calling this function +multiple times also is useful for servers providing the same service at +different, but not all network interfaces of the host. +

+

+When passing %NULL for @domain, the service is announced within the local +network only, otherwise it is announced at the specified DNS domain. The +responsible server must be +configured to support DNS-SD. +

+

+Pass NULL for host to use the official host name of the machine to announce +the service. On machines with multiple DNS entries you might want to explictly +choose a fully qualified DNS name to announce the service. +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

dispatcher :

a EpcDispatcher +

protocol :

the EpcAddressFamily this service supports

type :

the machine friendly name of the service

domain :

the DNS domain for the announcement, or NULL +

host :

the fully qualified host name of the service, or NULL +

port :

the TCP/IP port of the service

... :

an optional list of TXT records, terminated by NULL +
+
+
+
+

epc_dispatcher_add_service_subtype ()

+
void                epc_dispatcher_add_service_subtype  (EpcDispatcher *dispatcher,
+                                                         const gchar *type,
+                                                         const gchar *subtype);
+

+Announces an additional sub service for a registered DNS-SD service. +

+

+

+
+

Note

+

+This function will fail silently, when the service specified by +type hasn't been registered yet. +

+
+

+

+
++ + + + + + + + + + + + + + +

dispatcher :

a EpcDispatcher +

type :

the base service type

subtype :

the sub service type
+
+
+
+

epc_dispatcher_set_collision_handling ()

+
void                epc_dispatcher_set_collision_handling
+                                                        (EpcDispatcher *dispatcher,
+                                                         EpcCollisionHandling method);
+

+Changes the collision handling strategy the dispatcher uses. +See "collision-handling" for details. +

+
++ + + + + + + + + + +

dispatcher :

a EpcDispatcher +

method :

the new strategy
+

Since 0.3.1

+
+
+
+

epc_dispatcher_set_cookie ()

+
void                epc_dispatcher_set_cookie           (EpcDispatcher *dispatcher,
+                                                         const gchar *cookie);
+

+Changes the unique identifier of the service. +See "cookie" for details. +

+
++ + + + + + + + + + +

dispatcher :

a EpcDispatcher +

cookie :

the new service identifier, or NULL +
+

Since 0.3.1

+
+
+
+

epc_dispatcher_set_name ()

+
void                epc_dispatcher_set_name             (EpcDispatcher *dispatcher,
+                                                         const gchar *name);
+

+Changes the user friendly name used for announcing services. +See "name". +

+
++ + + + + + + + + + +

dispatcher :

a EpcDispatcher +

name :

the new user friendly name
+
+
+
+

epc_dispatcher_set_service_details ()

+
void                epc_dispatcher_set_service_details  (EpcDispatcher *dispatcher,
+                                                         const gchar *type,
+                                                         ...);
+

+Updates the list of TXT records for a registered DNS-SD service. +The TXT records are specified by the service type and usually +have the form of key-value pairs: +

+

+

+
+ + + + + + + + 
1
path=/dwarf-blog/
+
+ +

+

+

+

+
+

Note

+

+This function will fail silently, when the service specified by +type hasn't been registered yet. +

+
+

+

+
++ + + + + + + + + + + + + + +

dispatcher :

a EpcDispatcher +

type :

the service type

... :

a list of TXT records, terminated by NULL +
+
+
+
+

epc_dispatcher_get_collision_handling ()

+
EpcCollisionHandling epc_dispatcher_get_collision_handling
+                                                        (EpcDispatcher *dispatcher);
+

+Queries the collision handling strategy the dispatcher uses. +See "collision-handling" for details. +

+
++ + + + + + + + + + +

dispatcher :

a EpcDispatcher +

Returns :

The dispatcher's collision handling strategy, +or EPC_COLLISIONS_IGNORE on error.
+

Since 0.3.1

+
+
+
+

epc_dispatcher_get_cookie ()

+
const gchar *       epc_dispatcher_get_cookie           (EpcDispatcher *dispatcher);
+

+Queries the unique identifier of the service. +See "cookie" for details. +

+
++ + + + + + + + + + +

dispatcher :

a EpcDispatcher +

Returns :

The unique identifier of the service, or NULL on error.
+

Since 0.3.1

+
+
+
+

epc_dispatcher_get_name ()

+
const gchar *       epc_dispatcher_get_name             (EpcDispatcher *dispatcher);
+

+Queries the user friendly name used for announcing services. +See "name". +

+
++ + + + + + + + + + +

dispatcher :

a EpcDispatcher +

Returns :

The user friendly name of the service.
+
+
+
+

epc_address_family_get_class ()

+
GEnumClass *        epc_address_family_get_class        (void);
+

+Retrieves the GEnumClass describing the EpcAddressFamily enum. +

+
++ + + + +

Returns :

The GEnumClass describing EpcAddressFamily.
+
+
+
+

epc_address_family_to_string ()

+
const gchar *       epc_address_family_to_string        (EpcAddressFamily value);
+

+Retrieves the name of a EpcAddressFamily value, or NULL when value is invalid. +

+
++ + + + + + + + + + +

value :

a EpcAddressFamily value

Returns :

The string representation of value, or NULL.
+
+
+
+

epc_collision_handling_get_class ()

+
GEnumClass *        epc_collision_handling_get_class    (void);
+

+Retrieves the GEnumClass describing the EpcCollisionHandling enum. +

+
++ + + + +

Returns :

The GEnumClass describing EpcCollisionHandling.
+
+
+
+

epc_collision_handling_to_string ()

+
const gchar *       epc_collision_handling_to_string    (EpcCollisionHandling value);
+

+Retrieves the name of a EpcCollisionHandling value, or NULL when value is invalid. +

+
++ + + + + + + + + + +

value :

a EpcCollisionHandling value

Returns :

The string representation of value, or NULL.
+
+
+
+

Property Details

+
+

The "collision-handling" property

+
  "collision-handling"       EpcCollisionHandling  : Read / Write / Construct
+

The collision handling method to use.

+

Default value: EPC_COLLISIONS_CHANGE_NAME

+
+
+
+

The "cookie" property

+
  "cookie"                   gchar*                : Read / Write / Construct
+

Unique identifier of the service.

+

Default value: NULL

+
+
+
+

The "name" property

+
  "name"                     gchar*                : Read / Write / Construct
+

User friendly name of the service.

+

Default value: NULL

+
+
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcAuthContext.html libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcAuthContext.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcAuthContext.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcAuthContext.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,426 +0,0 @@ - - - - -EpcAuthContext - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcAuthContext

-

EpcAuthContext — manage authentication

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc/publish.h>
-
-enum                EpcAuthFlags;
-gboolean            (*EpcAuthHandler)                   (EpcAuthContext *context,
-                                                         const gchar *username,
-                                                         gpointer user_data);
-                    EpcAuthContext;
-gboolean            epc_auth_context_check_password     (const EpcAuthContext *context,
-                                                         const gchar *password);
-const gchar*        epc_auth_context_get_key            (const EpcAuthContext *context);
-const gchar*        epc_auth_context_get_password       (const EpcAuthContext *context);
-EpcPublisher*       epc_auth_context_get_publisher      (const EpcAuthContext *context);
-
-GFlagsClass*        epc_auth_flags_get_class            (void);
-const gchar*        epc_auth_flags_to_string            (EpcAuthFlags value);
-
-
-
-

Description

-

-With each request the EpcPublisher verifies access authorization by calling -the EpcAuthHandler registered for the key in question, if any. Information about -that process is stored in the EpcAuthContext structure. -

-

-To register an authentication handler call epc_publisher_set_auth_handler(): -

-

-

-
-

Example 3. Register an authentication handler

-
-  epc_publisher_set_auth_handler (publisher, "sensitive-key",
-                                  my_auth_handler, my_object);
-
-
-


-

-

-To verify that the user password provided password matches -the expected one use epc_auth_context_check_password(): -

-

-

-
-

Example 4. Verify a password

-
-  static gboolean
-  my_auth_handler (EpcAuthContext *context,
-                   const gchar    *username,
-                   gpointer        user_data)
-  {
-    MyObject *self = user_data;
-    const gchar *expected_password;
-    const gchar *requested_key;
-
-    requested_key = epc_auth_context_get_key (context);
-    expected_password = lookup_password (self, requested_key);
-
-    return epc_auth_context_check_password (context, expected_password);
-  }
-
-
-


-

-

-
-
-

Details

-
-

enum EpcAuthFlags

-
typedef enum /* <flags> */
-{
-  EPC_AUTH_DEFAULT =                     0,
-  EPC_AUTH_PASSWORD_TEXT_NEEDED =       (1 << 0)
-} EpcAuthFlags;
-
-

-These flags specify the authentication behaviour of an EpcPublisher.

-

-

-
-- - - - - - - - - - -

EPC_AUTH_DEFAULT

 The default authentication settings. -

EPC_AUTH_PASSWORD_TEXT_NEEDED

 Set this flag when your EpcAuthFlags -needs the supplied password in plain text - for instance to pass it to a -database server used by your application. This flag replaces the secure Digest -authentication scheme with the insecure Basic authentication scheme. -Therefore this setting is valid only when the publisher's transport -protocol is EPC_PROTOCOL_HTTPS (secure http). -
-
-
-
-

EpcAuthHandler ()

-
gboolean            (*EpcAuthHandler)                   (EpcAuthContext *context,
-                                                         const gchar *username,
-                                                         gpointer user_data);
-

-Functions implementing this callback shall return TRUE when the -credentials provided by the authentication request grant access -to the resource described by context. -

-

-The username is NULL when no creditials were passed, and anonymous access -is tried. -

-

-See also epc_publisher_set_auth_flags. When EPC_AUTH_DEFAULT is used, -you should call epc_auth_context_check_password -to verify that the password passed in the request matches the known password -for that user. In this case there is no way to retrieve the password from -the EpcAuthContext because the network protocol transfers just a hash code, -not the actual password. -

-

-However, when EPC_AUTH_PASSWORD_TEXT_NEEDED is used, you should call -epc_auth_context_get_password() and then do your own authentication check. -For instance, you might need to delegate the authentication to some other -code or server, such as a database server.

-

-

-
-- - - - - - - - - - - - - - - - - - -

context :

 the EpcAuthContext -

username :

 the username provided for authentication, or NULL -

user_data :

 user data set when the signal handler was installed -

Returns :

 TRUE when access is granted, and FALSE otherwise. -
-
-
-
-

EpcAuthContext

-
typedef struct _EpcAuthContext EpcAuthContext;
-

-This data structure describes a pending authentication request -which shall be verified by an EpcAuthHandler installed by -epc_publisher_set_auth_handler(). -

-

-

-
-

Note

-

- There is no way to retrieve the password from the EpcAuthContext, as - the network protocol transfers just a hash code, not the actual password. -

-
-

-

-
-
-
-

epc_auth_context_check_password ()

-
gboolean            epc_auth_context_check_password     (const EpcAuthContext *context,
-                                                         const gchar *password);
-

-Verifies that the password supplied with the network request matches -the password the application expects. There is no way to retrieve the -password from the EpcAuthContext, as the network protocol transfers -just a hash code, not the actual password.

-

-

-
-- - - - - - - - - - - - - - -

context :

 a EpcAuthContext -

password :

 the expected password -

Returns :

 TRUE when the sent password matches, or FALSE otherwise. -
-
-
-
-

epc_auth_context_get_key ()

-
const gchar*        epc_auth_context_get_key            (const EpcAuthContext *context);
-

-Queries the resource key associated with the authentication context.

-

-

-
-- - - - - - - - - - -

context :

 a EpcAuthContext -

Returns :

 The resource key. -
-
-
-
-

epc_auth_context_get_password ()

-
const gchar*        epc_auth_context_get_password       (const EpcAuthContext *context);
-

-Queries the password sent for the authentication context when Basic -authentication was allowed for the context, and NULL otherwise. -

-

-See also: EPC_AUTH_PASSWORD_TEXT_NEEDED

-

-

-
-- - - - - - - - - - -

context :

 a EpcAuthContext -

Returns :

 The password sent, or NULL. -
-
-
-
-

epc_auth_context_get_publisher ()

-
EpcPublisher*       epc_auth_context_get_publisher      (const EpcAuthContext *context);
-

-Queries the EpcPublisher owning the authentication context.

-

-

-
-- - - - - - - - - - -

context :

 a EpcAuthContext -

Returns :

 The owning EpcPublisher. -
-
-
-
-

epc_auth_flags_get_class ()

-
GFlagsClass*        epc_auth_flags_get_class            (void);
-

-Retrieves the GFlagsClass describing the EpcAuthFlags flags.

-

-

-
-- - - - -

Returns :

 The GFlagsClass describing EpcAuthFlags. -
-
-
-
-

epc_auth_flags_to_string ()

-
const gchar*        epc_auth_flags_to_string            (EpcAuthFlags value);
-

-Retrieves the name of a EpcAuthFlags value, or NULL when value is invalid.

-

-

-
-- - - - - - - - - - -

value :

 a EpcAuthFlags value -

Returns :

 The string representation of value, or NULL. -
-
-
-
-

See Also

-#EpcPublisher -
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcContents.html libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcContents.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcContents.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcContents.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,580 +0,0 @@ - - - - -EpcContents - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcContents

-

EpcContents — custom contents

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc/contents.h>
-
-gboolean            (*EpcContentsReadFunc)              (EpcContents *contents,
-                                                         gpointer buffer,
-                                                         gsize *length,
-                                                         gpointer user_data);
-                    EpcContents;
-EpcContents*        epc_contents_new                    (const gchar *type,
-                                                         gpointer data,
-                                                         gssize length,
-                                                         GDestroyNotify destroy_data);
-EpcContents*        epc_contents_new_dup                (const gchar *type,
-                                                         gconstpointer data,
-                                                         gssize length);
-EpcContents*        epc_contents_ref                    (EpcContents *contents);
-void                epc_contents_unref                  (EpcContents *contents);
-
-gconstpointer       epc_contents_get_data               (EpcContents *contents,
-                                                         gsize *length);
-const gchar*        epc_contents_get_mime_type          (EpcContents *contents);
-
-EpcContents*        epc_contents_stream_new             (const gchar *type,
-                                                         EpcContentsReadFunc callback,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data);
-gconstpointer       epc_contents_stream_read            (EpcContents *contents,
-                                                         gsize *length);
-gboolean            epc_contents_is_stream              (EpcContents *contents);
-
-
-
-

Description

-

-EpcContents is a reference counted structure for storing custom contents. -To publish custom content call epc_publisher_add_handler() to register a -EpcContentsHandler like this: -

-

-

-
-

Example 5. A custom contents handler

-
-  static EpcContents*
-  timestamp_handler (EpcPublisher *publisher G_GNUC_UNUSED,
-                     const gchar  *key G_GNUC_UNUSED,
-                     gpointer      data)
-  {
-    time_t now = time (NULL);
-    struct tm *tm = localtime (&now);
-    const gchar *format = data;
-    gsize length = 60;
-    gchar *buffer;
-
-    buffer = g_malloc (length);
-    length = strftime (buffer, length, format, tm);
-
-    return epc_content_new ("text/plain", buffer, length);
-  }
-
-
-


-

-

-
-
-

Details

-
-

EpcContentsReadFunc ()

-
gboolean            (*EpcContentsReadFunc)              (EpcContents *contents,
-                                                         gpointer buffer,
-                                                         gsize *length,
-                                                         gpointer user_data);
-

-This callback is used to retrieve the next chunk of data for a streaming -contents buffer created with epc_contents_stream_read. -

-

-Return FALSE when the buffer has reached its end, and no more data is -available. Also return FALSE, when the buffer size passed in length is -not sufficient. Copy your minimal buffer size to length in that situation. -

-

-The library might pass NULL for buffer on the first call to start buffer -size negotation. -

-

-See also: epc_contents_stream_new, epc_contents_stream_read

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

contents :

 a EpcContents buffer -

buffer :

 a location for storing the contents, or NULL -

length :

 a location for passing and storing the contents length in bytes. -

user_data :

 the user_data passed to epc_contents_stream_new -

Returns :

 Returns TRUE when the next chunk could be read, and FALSE on error. -
-
-
-
-

EpcContents

-
typedef struct _EpcContents EpcContents;
-

-A reference counted buffer for storing contents to deliver by the -EpcPublisher. Use epc_contents_new() or epc_contents_new_dup to create -instances of this buffer.

-

-

-
-
-
-

epc_contents_new ()

-
EpcContents*        epc_contents_new                    (const gchar *type,
-                                                         gpointer data,
-                                                         gssize length,
-                                                         GDestroyNotify destroy_data);
-

-Creates a new EpcContents buffer, and takes ownership of the data passed. -Passing NULL for type is equivalent to passing "application/octet-stream". -

-

-See also: epc_contents_new_dup, epc_contents_stream_new

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

type :

 the MIME type of this contents, or NULL -

data :

 static contents for the buffer -

length :

 the contents length in bytes, or -1 if data is a null-terminated string. -

destroy_data :

 This function will be called to free data when it is no longer needed. -

Returns :

 The newly created EpcContents buffer. -
-
-
-
-

epc_contents_new_dup ()

-
EpcContents*        epc_contents_new_dup                (const gchar *type,
-                                                         gconstpointer data,
-                                                         gssize length);
-

-Creates a new EpcContents buffer, and copies the data passed. -Passing NULL for type is equivalent to passing "application/octet-stream". -

-

-See also: epc_contents_new, epc_contents_stream_new

-

-

-
-- - - - - - - - - - - - - - - - - - -

type :

 the MIME type of this contents, or NULL -

data :

 static contents for the buffer -

length :

 the content's length in bytes, or -1 if data is a null-terminated string. -

Returns :

 The newly created EpcContents buffer. -
-
-
-
-

epc_contents_ref ()

-
EpcContents*        epc_contents_ref                    (EpcContents *contents);
-

-Increases the reference count of contents.

-

-

-
-- - - - - - - - - - -

contents :

 a EpcContents buffer -

Returns :

 the same contents buffer. -
-
-
-
-

epc_contents_unref ()

-
void                epc_contents_unref                  (EpcContents *contents);
-

-Decreases the reference count of contents. -When its reference count drops to 0, the buffer is released -(i.e. its memory is freed).

-

-

-
-- - - - -

contents :

 a EpcContents buffer -
-
-
-
-

epc_contents_get_data ()

-
gconstpointer       epc_contents_get_data               (EpcContents *contents,
-                                                         gsize *length);
-

-Retrieves the contents of a static contents buffer created with -epc_contents_new(). Any other buffer returns NULL. The data returned -is owned by the EpcContents buffer and must not be freeded. -

-

-See also: epc_contents_stream_read().

-

-

-
-- - - - - - - - - - - - - - -

contents :

 a EpcContents buffer -

length :

 a location for storing the contents length -

Returns :

 Returns the static buffer contents, or NULL. This should not be freed or modified. -
-
-
-
-

epc_contents_get_mime_type ()

-
const gchar*        epc_contents_get_mime_type          (EpcContents *contents);
-

-Queries the MIME type associated with the buffer. Returns the MIME -type specified for epc_contents_new() or epc_contents_stream_new, -or "application/octet-stream" when NULL was passed.

-

-

-
-- - - - - - - - - - -

contents :

 a EpcContents buffer -

Returns :

 Returns the MIME type of the buffer. -
-
-
-
-

epc_contents_stream_new ()

-
EpcContents*        epc_contents_stream_new             (const gchar *type,
-                                                         EpcContentsReadFunc callback,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data);
-

-Creates a new EpcContents buffer for large contents like movie files, -which cannot, or should be delivered as solid blob of data. -

-

-Passing NULL for type is equivalent to passing "application/octet-stream". -

-

-See also: epc_contents_stream_read(), epc_contents_is_stream

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

type :

 the MIME type of this contents, or NULL -

callback :

 the function for retrieving chunks -

user_data :

 data which will be passed to callback -

destroy_data :

 This function will be called to free user_data when it is no longer needed. -

Returns :

 The newly created EpcContents buffer. -
-
-
-
-

epc_contents_stream_read ()

-
gconstpointer       epc_contents_stream_read            (EpcContents *contents,
-                                                         gsize *length);
-

-Retrieves the next chunk of data for a streaming contents buffer created -with epc_contents_stream_read(). NULL is returned, when the buffer has -reached its end, or isn't a streaming contents buffer. -

-

-The data returned is owned by the EpcContents buffer and must not be -freeded by the called. Make sure to copy the returned data before the -function again, as repeated calls to the function might return the -same buffer, but filled with new data. -

-

-See also: epc_contents_stream_new(), epc_contents_is_stream

-

-

-
-- - - - - - - - - - - - - - -

contents :

 a EpcContents buffer -

length :

 a location for storing the contents length -

Returns :

 Returns the next chunk of data, or NULL. The should not be freed or modified. -
-
-
-
-

epc_contents_is_stream ()

-
gboolean            epc_contents_is_stream              (EpcContents *contents);
-

-Checks if stream routines can be used for retreiving -the contents of the buffer. -

-

-See also: epc_contents_stream_new(), epc_contents_stream_read

-

-

-
-- - - - - - - - - - -

contents :

 a EpcContents buffer -

Returns :

 Returns TRUE when stream routines have to be used. -
-
-
-
-

See Also

-#EpcPublisher -
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcProtocol.html libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcProtocol.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcProtocol.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcProtocol.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,333 +0,0 @@ - - - - -EpcProtocol - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcProtocol

-

EpcProtocol — transport protocols

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc/protcol.h>
-
-enum                EpcProtocol;
-EpcProtocol         epc_protocol_from_name              (const gchar *name,
-                                                         EpcProtocol fallback);
-gchar*              epc_protocol_build_uri              (EpcProtocol protocol,
-                                                         const gchar *hostname,
-                                                         guint16 port,
-                                                         const gchar *path);
-const gchar*        epc_protocol_get_service_type       (EpcProtocol protocol);
-const gchar*        epc_protocol_get_uri_scheme         (EpcProtocol protocol);
-GEnumClass*         epc_protocol_get_class              (void);
-const gchar*        epc_protocol_to_string              (EpcProtocol value);
-
-
-
-

Description

-

-Since the Easy Publish and Consume library hides the details of the -transport mechanism used, it is possible to support different mechanisms. -Currently there is support for HTTP and HTTPS. -

-

-The EpcProtocol enumeration is the maximum of information libepc wants to -expose regarding its transport mechanisms.

-

-

-
-
-

Details

-
-

enum EpcProtocol

-
typedef enum
-{
-  EPC_PROTOCOL_UNKNOWN,
-  EPC_PROTOCOL_HTTP,
-  EPC_PROTOCOL_HTTPS
-}
-EpcProtocol;
-
-

-The transport protocols supported by libepc.

-

-

-
-- - - - - - - - - - - - - - -

EPC_PROTOCOL_UNKNOWN

 Used when the transport protocol is not known yet. -

EPC_PROTOCOL_HTTP

 Plain HTTP. Passwords are protected using HTTP digest -authentication, remaining data is transfered without any encryption. -

EPC_PROTOCOL_HTTPS

 Encrypted HTTP. Attempts are made to use this -transport method when ever possible. -
-
-
-
-

epc_protocol_from_name ()

-
EpcProtocol         epc_protocol_from_name              (const gchar *name,
-                                                         EpcProtocol fallback);
-

-Parses the protocol name. Case of the name doesn't matter. Returns the -matching EpcProtocol, when the name was recognized, and the value of -fallback otherwise.

-

-

-
-- - - - - - - - - - - - - - -

name :

 a protocol name -

fallback :

 the EpcProtocol to use on errors -

Returns :

 The EpcProtocol matching name, or fallback on error. -
-
-
-
-

epc_protocol_build_uri ()

-
gchar*              epc_protocol_build_uri              (EpcProtocol protocol,
-                                                         const gchar *hostname,
-                                                         guint16 port,
-                                                         const gchar *path);
-

-Builds the Unified Resource Identifier (URI) for a service. -The returned string should be released when no longer needed.

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

protocol :

 a EpcProtocol -

hostname :

 the host to contact -

port :

 the service port -

path :

 the service path, or NULL -

Returns :

 A newly allocated string with the URI for the service, -or NULL on error. -
-
-
-
-

epc_protocol_get_service_type ()

-
const gchar*        epc_protocol_get_service_type       (EpcProtocol protocol);
-

-Queries the DNS-SD service type associated with a EpcProtocol. -See EPC_SERVICE_TYPE_HTTP, EPC_SERVICE_TYPE_HTTPS.

-

-

-
-- - - - - - - - - - -

protocol :

 a EpcProtocol -

Returns :

 Returns the DNS-SD service type associated -with protocol, or NULL on unknown protocols. -
-
-
-
-

epc_protocol_get_uri_scheme ()

-
const gchar*        epc_protocol_get_uri_scheme         (EpcProtocol protocol);
-

-Queries the URI scheme associated with a EpcProtocol. -See epc_service_type_build_uri().

-

-

-
-- - - - - - - - - - -

protocol :

 a EpcProtocol -

Returns :

 Returns the URI scheme associated with protocol, -or NULL on unknown protocols. -
-
-
-
-

epc_protocol_get_class ()

-
GEnumClass*         epc_protocol_get_class              (void);
-

-Retrieves the GEnumClass describing the EpcProtocol enum.

-

-

-
-- - - - -

Returns :

 The GEnumClass describing EpcProtocol. -
-
-
-
-

epc_protocol_to_string ()

-
const gchar*        epc_protocol_to_string              (EpcProtocol value);
-

-Retrieves the name of a EpcProtocol value, or NULL when value is invalid.

-

-

-
-- - - - - - - - - - -

value :

 a EpcProtocol value -

Returns :

 The string representation of value, or NULL. -
-
-
-
-

See Also

-epc_service_type_new() -
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcServiceInfo.html libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcServiceInfo.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcServiceInfo.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcServiceInfo.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,481 +0,0 @@ - - - - -EpcServiceInfo - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcServiceInfo

-

EpcServiceInfo — DNS-SD service descriptions

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc/service-info.h>
-
-                    EpcServiceInfo;
-EpcServiceInfo*     epc_service_info_new                (const gchar *type,
-                                                         const gchar *host,
-                                                         guint port,
-                                                         const AvahiStringList *details);
-EpcServiceInfo*     epc_service_info_new_full           (const gchar *type,
-                                                         const gchar *host,
-                                                         guint port,
-                                                         const AvahiStringList *details,
-                                                         const AvahiAddress *address,
-                                                         const gchar *ifname);
-EpcServiceInfo*     epc_service_info_ref                (EpcServiceInfo *info);
-void                epc_service_info_unref              (EpcServiceInfo *info);
-
-const AvahiAddress* epc_service_info_get_address        (const EpcServiceInfo *info);
-EpcAddressFamily    epc_service_info_get_address_family (const EpcServiceInfo *info);
-const gchar*        epc_service_info_get_detail         (const EpcServiceInfo *info,
-                                                         const gchar *name);
-const gchar*        epc_service_info_get_host           (const EpcServiceInfo *info);
-const gchar*        epc_service_info_get_interface      (const EpcServiceInfo *info);
-guint               epc_service_info_get_port           (const EpcServiceInfo *info);
-const gchar*        epc_service_info_get_service_type   (const EpcServiceInfo *info);
-
-
-
-

Description

-

-The EpcServiceInfo object describes DNS-SD services.

-

-

-
-
-

Details

-
-

EpcServiceInfo

-
typedef struct _EpcServiceInfo EpcServiceInfo;
-

-Description of a network service. -See also: epc_service_monitor_new().

-

-

-
-
-
-

epc_service_info_new ()

-
EpcServiceInfo*     epc_service_info_new                (const gchar *type,
-                                                         const gchar *host,
-                                                         guint port,
-                                                         const AvahiStringList *details);
-

-Creates a new service description using the information provided. The -details list usually is retrieved from the TXT record the dynamic naming -system (DNS) provides for the service. When using Avahi's service chooser -aui_service_dialog_get_txt_data() can be used for getting a details list. -To create an ad-hoc list use avahi_string_list_new() and related functions.

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

type :

 the DNS-SD service type -

host :

 the DNS hostname -

port :

 the TCP/IP port -

details :

 list of key-value pairs, or NULL -

Returns :

 The newly created service description, or NULL on error. -
-
-
-
-

epc_service_info_new_full ()

-
EpcServiceInfo*     epc_service_info_new_full           (const gchar *type,
-                                                         const gchar *host,
-                                                         guint port,
-                                                         const AvahiStringList *details,
-                                                         const AvahiAddress *address,
-                                                         const gchar *ifname);
-

-Creates a new service description using the information provided. The -details list usually is retrieved from the TXT record the dynamic naming -system (DNS) provides for the service. When using Avahi's service chooser -aui_service_dialog_get_txt_data() can be used for getting a details list. -To create an ad-hoc list use avahi_string_list_new() and related functions.

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

type :

 the DNS-SD service type -

host :

 the DNS hostname -

port :

 the TCP/IP port -

details :

 list of key-value pairs, or NULL -

address :

 IP address of the service, or NULL -

ifname :

 network interface for contacting the service, or NULL -

Returns :

 The newly created service description, or NULL on error. -
-
-
-
-

epc_service_info_ref ()

-
EpcServiceInfo*     epc_service_info_ref                (EpcServiceInfo *info);
-

-Increases the reference count of info by one. -See also: epc_service_info_unref()

-

-

-
-- - - - - - - - - - -

info :

 a EpcServiceInfo -

Returns :

 The same info object. -
-
-
-
-

epc_service_info_unref ()

-
void                epc_service_info_unref              (EpcServiceInfo *info);
-

-Decreases the reference count of info by one. When its reference count -drops to 0, the object is finalized (i.e. its memory is freed). -

-

-See also: epc_service_info_ref()

-

-

-
-- - - - -

info :

 a EpcServiceInfo -
-
-
-
-

epc_service_info_get_address ()

-
const AvahiAddress* epc_service_info_get_address        (const EpcServiceInfo *info);
-

-Retrieves the IP address for contacting the service, -or NULL when that information is not available.

-

-

-
-- - - - - - - - - - -

info :

 a EpcServiceInfo -

Returns :

 A IP address, or NULL. -
-
-
-
-

epc_service_info_get_address_family ()

-
EpcAddressFamily    epc_service_info_get_address_family (const EpcServiceInfo *info);
-

-Retrieves the address family for contacting the service, -or EPC_ADDRESS_UNSPEC when that information is not available.

-

-

-
-- - - - - - - - - - -

info :

 a EpcServiceInfo -

Returns :

 A EpcAddressFamily. -
-
-
-
-

epc_service_info_get_detail ()

-
const gchar*        epc_service_info_get_detail         (const EpcServiceInfo *info,
-                                                         const gchar *name);
-

-Retrieves a detail stored in the service's TXT record. -Returns NULL when the requested information is not available.

-

-

-
-- - - - - - - - - - - - - - -

info :

 a EpcServiceInfo -

name :

 the detail's name -

Returns :

 The requested service detail, or NULL. -
-
-
-
-

epc_service_info_get_host ()

-
const gchar*        epc_service_info_get_host           (const EpcServiceInfo *info);
-

-Retrieves the DNS host name associated with info.

-

-

-
-- - - - - - - - - - -

info :

 a EpcServiceInfo -

Returns :

 A DNS host name. -
-
-
-
-

epc_service_info_get_interface ()

-
const gchar*        epc_service_info_get_interface      (const EpcServiceInfo *info);
-

-Retrieves the name of the network interface which must be used for -contacting the service, or NULL when that information is not available.

-

-

-
-- - - - - - - - - - -

info :

 a EpcServiceInfo -

Returns :

 A network interface name, or NULL. -
-
-
-
-

epc_service_info_get_port ()

-
guint               epc_service_info_get_port           (const EpcServiceInfo *info);
-

-Retrieves the TCP/IP port associated with info.

-

-

-
-- - - - - - - - - - -

info :

 a EpcServiceInfo -

Returns :

 A TCP/IP port. -
-
-
-
-

epc_service_info_get_service_type ()

-
const gchar*        epc_service_info_get_service_type   (const EpcServiceInfo *info);
-

-Retrieves the DNS-SD service type associated with info.

-

-

-
-- - - - - - - - - - -

info :

 a EpcServiceInfo -

Returns :

 A DNS-SD service type. -
-
-
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-EpcServiceType.html libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-EpcServiceType.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-EpcServiceType.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-EpcServiceType.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,256 @@ + + + + +EpcServiceType + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcServiceType

+

EpcServiceType — service type details

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc/service-type.h>
+
+#define             EPC_SERVICE_TYPE_HTTP
+#define             EPC_SERVICE_TYPE_HTTPS
+const gchar *       epc_service_type_get_base           (const gchar *type);
+EpcProtocol         epc_service_type_get_protocol       (const gchar *service_type);
+gchar **            epc_service_type_list_supported     (const gchar *application);
+gchar *             epc_service_type_new                (EpcProtocol protocol,
+                                                         const gchar *application);
+
+
+
+

Description

+

+DNS-SD uses well-known services types to discover service providers. +The following macros describe the service types uses by this library. +

+

+

+
+

Example 9. Find an Easy-Publish server

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
dialog = aui_service_dialog_new ("Choose an Easy Publish Server", NULL,
+                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                 GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT,
+                                 NULL);
+aui_service_dialog_set_browse_service_types (AUI_SERVICE_DIALOG (dialog),
+                                             EPC_SERVICE_TYPE_HTTPS,
+                                             EPC_SERVICE_TYPE_HTTP,
+                                             NULL);
+
+if (GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog)))
+  {
+    const gint port = aui_service_dialog_get_port (AUI_SERVICE_DIALOG (dialog));
+    const gchar *host = aui_service_dialog_get_host_name (AUI_SERVICE_DIALOG (dialog));
+    const gchar *type = aui_service_dialog_get_service_type (AUI_SERVICE_DIALOG (dialog));
+    EpcProtocol protocol = epc_service_type_get_protocol (type);
+    ...
+  }
+
+ +
+


+

+
+
+

Details

+
+

EPC_SERVICE_TYPE_HTTP

+
#define EPC_SERVICE_TYPE_HTTP   "_easy-publish-http._tcp"
+
+

+The well-known DNS-SD service type for EpcPublisher +servers providing unencrypted HTTP access. +

+
+
+
+

EPC_SERVICE_TYPE_HTTPS

+
#define EPC_SERVICE_TYPE_HTTPS  "_easy-publish-https._tcp"
+
+

+The well-known DNS-SD service type for EpcPublisher +servers providing encrypted HTTPS access. +

+
+
+
+

epc_service_type_get_base ()

+
const gchar *       epc_service_type_get_base           (const gchar *type);
+

+Extracts the base service-type of a DNS-SD service-type. +

+

+DNS-SD service types may contain a sub service type, for instance the +service-type "_anon._sub._ftp._tcp" contains the base-type "_ftp._tcp" +and the sub-type "_anon". This function extracts extracts the base-type. +The service type is returned unmodifed if it doesn't contain a sub-type. +

+
++ + + + + + + + + + +

type :

a DNS-SD service-type

Returns :

The base-service-type.
+
+
+
+

epc_service_type_get_protocol ()

+
EpcProtocol         epc_service_type_get_protocol       (const gchar *service_type);
+

+Queries the EpcProtocol associated with a DNS-SD service type. +See EPC_SERVICE_TYPE_HTTP, EPC_SERVICE_TYPE_HTTPS. +

+
++ + + + + + + + + + +

service_type :

a DNS-SD service type

Returns :

Returns the EpcProtocol associated with service_type, +or EPC_PROTOCOL_UNKNOWN for unrecognized or unsupported service types.
+
+
+
+

epc_service_type_list_supported ()

+
gchar **            epc_service_type_list_supported     (const gchar *application);
+

+Lists all service types supported by the library. When application is NULL +just the generic types, otherwise the service-subtypes for that application +are returned. The returned list is terminated by NULL and must be released +by the caller with g_strfreev(). +

+

+See also: epc_service_type_new(). +

+
++ + + + + + + + + + +

application :

an application name, or NULL +

Returns :

The NULL terminated list of all supported service types.
+
+
+
+

epc_service_type_new ()

+
gchar *             epc_service_type_new                (EpcProtocol protocol,
+                                                         const gchar *application);
+

+Builds the DNS-SD service type for the given transport protocol and +application. When application is NULL, the application name is retrieved by +calling g_get_prgname(). NULL is returned in that case if g_get_prgname() returns NULL. +

+

+The string returned should be released when no longer needed. +

+
++ + + + + + + + + + + + + + +

protocol :

a EpcProtocol +

application :

the application name, or NULL +

Returns :

A newly allocated string holding the requested service-type, +or NULL when application is NULL and g_get_prgname() fails.
+
+
+
+

See Also

+EpcConsumer, EpcPublisher +
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcServiceType.html libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcServiceType.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcServiceType.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcServiceType.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,287 +0,0 @@ - - - - -EpcServiceType - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcServiceType

-

EpcServiceType — service type details

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc/service-type.h>
-
-#define             EPC_SERVICE_TYPE_HTTP
-#define             EPC_SERVICE_TYPE_HTTPS
-const gchar*        epc_service_type_get_base           (const gchar *type);
-EpcProtocol         epc_service_type_get_protocol       (const gchar *service_type);
-gchar**             epc_service_type_list_supported     (const gchar *application);
-gchar*              epc_service_type_new                (EpcProtocol protocol,
-                                                         const gchar *application);
-
-
-
-

Description

-

-DNS-SD uses well-known services types to discover service providers. -The following macros describe the service types uses by this library. -

-

-

-
-

Example 9. Find an Easy-Publish server

-
-  dialog = aui_service_dialog_new ("Choose an Easy Publish Server", NULL,
-                                   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                   GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT,
-                                   NULL);
-  aui_service_dialog_set_browse_service_types (AUI_SERVICE_DIALOG (dialog),
-                                               EPC_SERVICE_TYPE_HTTPS,
-                                               EPC_SERVICE_TYPE_HTTP,
-                                               NULL);
-
-  if (GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog)))
-    {
-      const gint port = aui_service_dialog_get_port (AUI_SERVICE_DIALOG (dialog));
-      const gchar *host = aui_service_dialog_get_host_name (AUI_SERVICE_DIALOG (dialog));
-      const gchar *type = aui_service_dialog_get_service_type (AUI_SERVICE_DIALOG (dialog));
-      EpcProtocol protocol = epc_service_type_get_protocol (type);
-      ...
-    }
-
-
-


-

-

-
-
-

Details

-
-

EPC_SERVICE_TYPE_HTTP

-
#define EPC_SERVICE_TYPE_HTTP   "_easy-publish-http._tcp"
-
-

-The well-known DNS-SD service type for EpcPublisher -servers providing unencrypted HTTP access.

-

-

-
-
-
-

EPC_SERVICE_TYPE_HTTPS

-
#define EPC_SERVICE_TYPE_HTTPS  "_easy-publish-https._tcp"
-
-

-The well-known DNS-SD service type for EpcPublisher -servers providing encrypted HTTPS access.

-

-

-
-
-
-

epc_service_type_get_base ()

-
const gchar*        epc_service_type_get_base           (const gchar *type);
-

-Extracts the base service-type of a DNS-SD service-type. -

-

-DNS-SD service types may contain a sub service type, for instance the -service-type "_anon._sub._ftp._tcp" contains the base-type "_ftp._tcp" -and the sub-type "_anon". This function extracts extracts the base-type. -The service type is returned unmodifed if it doesn't contain a sub-type.

-

-

-
-- - - - - - - - - - -

type :

 a DNS-SD service-type -

Returns :

 The base-service-type. -
-
-
-
-

epc_service_type_get_protocol ()

-
EpcProtocol         epc_service_type_get_protocol       (const gchar *service_type);
-

-Queries the EpcProtocol associated with a DNS-SD service type. -See EPC_SERVICE_TYPE_HTTP, EPC_SERVICE_TYPE_HTTPS.

-

-

-
-- - - - - - - - - - -

service_type :

 a DNS-SD service type -

Returns :

 Returns the EpcProtocol associated with service_type, -or EPC_PROTOCOL_UNKNOWN for unrecognized or unsupported service types. -
-
-
-
-

epc_service_type_list_supported ()

-
gchar**             epc_service_type_list_supported     (const gchar *application);
-

-Lists all service types supported by the library. When application is NULL -just the generic types, otherwise the service-subtypes for that application -are returned. The returned list is terminated by NULL and must be released -by the caller with g_strfreev(). -

-

-See also: epc_service_type_new().

-

-

-
-- - - - - - - - - - -

application :

 an application name, or NULL -

Returns :

 The NULL terminated list of all supported service types. -
-
-
-
-

epc_service_type_new ()

-
gchar*              epc_service_type_new                (EpcProtocol protocol,
-                                                         const gchar *application);
-

-Builds the DNS-SD service type for the given transport protocol and -application. When application is NULL, the application name is retrieved by -calling g_get_prgname(). NULL is returned in that case if g_get_prgname() returns NULL. -

-

-The string returned should be released when no longer needed.

-

-

-
-- - - - - - - - - - - - - - -

protocol :

 a EpcProtocol -

application :

 the application name, or NULL -

Returns :

 A newly allocated string holding the requested service-type, -or NULL when application is NULL and g_get_prgname() fails. -
-
-
-
-

See Also

-#EpcConsumer, EpcPublisher -
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-EpcShell.html libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-EpcShell.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-EpcShell.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-EpcShell.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,511 @@ + + + + +EpcShell + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcShell

+

EpcShell — library management functions

+
+
+

Stability Level

+Private, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc/shell.h>
+
+#define             EPC_DEBUG_LEVEL                     (level)
+guint               epc_shell_get_debug_level           (void);
+
+struct              EpcShellProgressHooks;
+void                epc_shell_progress_begin            (const gchar *title,
+                                                         const gchar *message);
+void                epc_shell_progress_end              (void);
+void                epc_shell_progress_update           (gdouble percentage,
+                                                         const gchar *message);
+void                epc_shell_set_progress_hooks        (const EpcShellProgressHooks *hooks,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy_data);
+
+#define             EPC_AVAHI_ERROR
+guint               epc_shell_watch_avahi_client_state  (AvahiClientCallback callback,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy_data,
+                                                         GError **error);
+AvahiEntryGroup *   epc_shell_create_avahi_entry_group  (AvahiEntryGroupCallback callback,
+                                                         gpointer user_data);
+AvahiServiceBrowser * epc_shell_create_service_browser  (AvahiIfIndex interface,
+                                                         AvahiProtocol protocol,
+                                                         const gchar *type,
+                                                         const gchar *domain,
+                                                         AvahiLookupFlags flags,
+                                                         AvahiServiceBrowserCallback callback,
+                                                         gpointer user_data,
+                                                         GError **error);
+void                epc_shell_restart_avahi_client      (const gchar *strloc);
+const gchar *       epc_shell_get_host_name             (GError **error);
+void                epc_shell_watch_remove              (guint id);
+
+
+
+

Description

+

+The methods of the EpcShell singleton are used to manage library resources. +

+
+
+

Details

+
+

EPC_DEBUG_LEVEL()

+
#define EPC_DEBUG_LEVEL(level) G_UNLIKELY(epc_shell_get_debug_level () >= (level))
+
+

+Checks if the library's debug level, which can be modified by setting the +EPC_DEBUG environment variable, is above the value +sepecified by level. +

+
++ + + + + + + + + + +

level :

the minimum level to check for

Returns :

 +TRUE if the library's debug level is above the threshold specified +by level, and FALSE otherwise.
+
+
+
+

epc_shell_get_debug_level ()

+
guint               epc_shell_get_debug_level           (void);
+

+Query the library's debug level. The debug level can be modified by setting +the external EPC_DEBUG environment variable. In most +cases the EPC_DEBUG_LEVEL macro should be used, instead of calling this +checking the return value of this function. +

+
++ + + + +

Returns :

The library's current debugging level.
+
+
+
+

struct EpcShellProgressHooks

+
struct EpcShellProgressHooks {
+  void (*begin)  (const gchar *title,
+                  gpointer     user_data);
+  void (*update) (gdouble      percentage,
+                  const gchar *message,
+                  gpointer     user_data);
+  void (*end)    (gpointer     user_data);
+};
+
+

+This table is used by epc_shell_set_progress_hooks to install functions +allowing the library to provide feedback during processing. +

+

+See also: epc_progress_window_install +

+
++ + + + + + + + + + + + + + +

begin ()

the function called by epc_shell_progress_begin +

update ()

the function called by epc_shell_progress_update +

end ()

the function called by epc_shell_progress_end +
+
+
+
+

epc_shell_progress_begin ()

+
void                epc_shell_progress_begin            (const gchar *title,
+                                                         const gchar *message);
+

+Call this function before starting a lengthy operation to allow the +application tp provide some visual feedback during the operation, +and to generally keep its UI responsive. +

+

+This function calls your "begin" hook with title +as argument and "update" with message. +

+

+See also: epc_shell_set_progress_hooks(), epc_progress_window_install, +epc_shell_progress_update(), epc_shell_progress_end +

+
++ + + + + + + + + + +

title :

the title of the lengthy operation

message :

description of the lengthy operation
+
+
+
+

epc_shell_progress_end ()

+
void                epc_shell_progress_end              (void);
+

+Call this function when your lengthy operation has finished. +

+

+See also: epc_shell_set_progress_hooks(), epc_progress_window_install, +epc_shell_progress_begin(), epc_shell_progress_update +

+
+
+
+

epc_shell_progress_update ()

+
void                epc_shell_progress_update           (gdouble percentage,
+                                                         const gchar *message);
+

+Called this function to inform about progress of a lengthy operation. +The progress is expressed as percentage in the range [0..1], or -1 if the +progress cannot be estimated. +

+

+See also: epc_shell_set_progress_hooks(), epc_progress_window_install, +epc_shell_progress_begin, epc_shell_progress_end() +

+
++ + + + + + + + + + +

percentage :

current progress of the operation, or -1

message :

a description of the current progress
+
+
+
+

epc_shell_set_progress_hooks ()

+
void                epc_shell_set_progress_hooks        (const EpcShellProgressHooks *hooks,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy_data);
+

+Installs functions which are called during processing, such as generating +server keys. This allows the application to indicate progress and generally +keep its UI responsive. If no progress callbacks are provided, +or when NULL is passed for hooks, progress messages are written to the +console. +

+

+See also: EpcEntropyProgress +

+
++ + + + + + + + + + + + + + +

hooks :

the function table to install, or NULL +

user_data :

custom data which shall be passed to the start hook

destroy_data :

function to call on user_data when the hooks are replaced
+
+
+
+

EPC_AVAHI_ERROR

+
#define EPC_AVAHI_ERROR (epc_avahi_error_quark ())
+
+

+Error domain for Avahi operations. Errors in this +domain will be Avahi error codes. See GError +for information on error domains. +

+
+
+
+

epc_shell_watch_avahi_client_state ()

+
guint               epc_shell_watch_avahi_client_state  (AvahiClientCallback callback,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy_data,
+                                                         GError **error);
+

+Registers a function to watch state changes of the library's AvahiClient. +On success the identifier of the newly created watch is returned. Pass it +to epc_shell_watch_remove() to remove the watch. On failure it returns 0 and +sets error. The error domain is EPC_AVAHI_ERROR. Possible error codes are +those of the Avahi library. +

+

+

+
+

Note

+

+ Usually there is no need in handling the AVAHI_CLIENT_FAILURE state + for callback, as the callback dispatcher takes care already. This + state is dispatched mostly for notification purposes. +

+
+

+

+
++ + + + + + + + + + + + + + + + + + + + + + +

callback :

a callback function

user_data :

data to pass to callback +

destroy_data :

a function for freeing user_data when removing the watch

error :

return location for a GError, or NULL +

Returns :

The identifier of the newly created watch, or 0 on error.
+
+
+
+

epc_shell_create_avahi_entry_group ()

+
AvahiEntryGroup *   epc_shell_create_avahi_entry_group  (AvahiEntryGroupCallback callback,
+                                                         gpointer user_data);
+

+Creates a new AvahiEntryGroup for the library's shared AvahiClient. +On success the newly created AvahiEntryGroup is returned, +and NULL on failure. +

+
++ + + + + + + + + + + + + + +

callback :

a callback function

user_data :

data to pass to callback +

Returns :

The newly created AvahiEntryGroup, or NULL on error.
+
+
+
+

epc_shell_create_service_browser ()

+
AvahiServiceBrowser * epc_shell_create_service_browser  (AvahiIfIndex interface,
+                                                         AvahiProtocol protocol,
+                                                         const gchar *type,
+                                                         const gchar *domain,
+                                                         AvahiLookupFlags flags,
+                                                         AvahiServiceBrowserCallback callback,
+                                                         gpointer user_data,
+                                                         GError **error);
+

+Creates a new AvahiServiceBrowser for the library's shared AvahiClient. +On success the newly created AvahiEntryGroup is returned. On failure +NULL is returned and error is set. The error domain is EPC_AVAHI_ERROR. +Possible error codes are those of the Avahi library. +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

interface :

the index of the network interface to watch

protocol :

the protocol of the services to watch

type :

the DNS-SD service type to watch

domain :

the DNS domain to watch, or NULL +

flags :

flags for creating the service browser

callback :

a callback function

user_data :

data to pass to callback +

error :

return location for a GError, or NULL +

Returns :

The newly created AvahiServiceBrowser, or NULL on error.
+
+
+
+

epc_shell_restart_avahi_client ()

+
void                epc_shell_restart_avahi_client      (const gchar *strloc);
+

+Requests restart of the builtin Avahi client. Use this function to react on +critical failures (like AVAHI_ENTRY_GROUP_FAILURE) reported to your Avahi +callbacks. The strloc argument is used to prevent endless restart cycles. +

+

+

+
+

Note

+

+ Do not call this function to react on AVAHI_CLIENT_FAILURE in a + AvahiClientCallback. The builtin callback dispatcher deals with + that situation. +

+
+

+

+
++ + + + +

strloc :

code location of the callee (G_STRLOC)
+
+
+
+

epc_shell_get_host_name ()

+
const gchar *       epc_shell_get_host_name             (GError **error);
+

+Retrieves the official host name of this machine. On failure the function +returns NULL and sets error. The error domain is EPC_AVAHI_ERROR. +Possible error codes are those of the Avahi library. +

+
++ + + + + + + + + + +

error :

return location for a GError, or NULL +

Returns :

The official host name, or NULL on error.
+
+
+
+

epc_shell_watch_remove ()

+
void                epc_shell_watch_remove              (guint id);
+

+Removes the watching callback identified by id. +

+

+See also: epc_shell_watch_avahi_client() +

+
++ + + + +

id :

identifier of an watching callback
+
+
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcShell.html libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcShell.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcShell.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcShell.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,630 +0,0 @@ - - - - -EpcShell - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcShell

-

EpcShell — library management functions

-
-
-

Stability Level

-Private, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc/shell.h>
-
-#define             EPC_DEBUG_LEVEL                     (level)
-guint               epc_shell_get_debug_level           (void);
-
-                    EpcShellProgressHooks;
-void                epc_shell_progress_begin            (const gchar *title,
-                                                         const gchar *message);
-void                epc_shell_progress_end              (void);
-void                epc_shell_progress_update           (gdouble percentage,
-                                                         const gchar *message);
-void                epc_shell_set_progress_hooks        (const EpcShellProgressHooks *hooks,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data);
-
-#define             EPC_AVAHI_ERROR
-guint               epc_shell_watch_avahi_client_state  (AvahiClientCallback callback,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data,
-                                                         GError **error);
-AvahiEntryGroup*    epc_shell_create_avahi_entry_group  (AvahiEntryGroupCallback callback,
-                                                         gpointer user_data);
-AvahiServiceBrowser* epc_shell_create_service_browser   (AvahiIfIndex interface,
-                                                         AvahiProtocol protocol,
-                                                         const gchar *type,
-                                                         const gchar *domain,
-                                                         AvahiLookupFlags flags,
-                                                         AvahiServiceBrowserCallback callback,
-                                                         gpointer user_data,
-                                                         GError **error);
-void                epc_shell_restart_avahi_client      (const gchar *strloc);
-const gchar*        epc_shell_get_host_name             (GError **error);
-void                epc_shell_watch_remove              (guint id);
-
-
-
-

Description

-

-The methods of the EpcShell singleton are used to manage library resources.

-

-

-
-
-

Details

-
-

EPC_DEBUG_LEVEL()

-
#define EPC_DEBUG_LEVEL(level) G_UNLIKELY(epc_shell_get_debug_level () >= (level))
-
-

-Checks if the library's debug level, which can be modified by setting the -EPC_DEBUG environment variable, is above the value -sepecified by level.

-

-

-
-- - - - -

level :

 the minimum level to check for -
-
-
-
-

epc_shell_get_debug_level ()

-
guint               epc_shell_get_debug_level           (void);
-

-Query the library's debug level. The debug level can be modified by setting -the external EPC_DEBUG environment variable. In most -cases the EPC_DEBUG_LEVEL macro should be used, instead of calling this -checking the return value of this function.

-

-

-
-- - - - -

Returns :

 The library's current debugging level. -
-
-
-
-

EpcShellProgressHooks

-
typedef struct {
-  void (*begin)  (const gchar *title,
-                  gpointer     user_data);
-  void (*update) (gdouble      percentage,
-                  const gchar *message,
-                  gpointer     user_data);
-  void (*end)    (gpointer     user_data);
-} EpcShellProgressHooks;
-
-

-This table is used by epc_shell_set_progress_hooks to install functions -allowing the library to provide feedback during processing. -

-

-See also: epc_progress_window_install

-

-

-
-- - - - - - - - - - - - - - -

begin ()

 the function called by epc_shell_progress_begin -

update ()

 the function called by epc_shell_progress_update -

end ()

 the function called by epc_shell_progress_end -
-
-
-
-

epc_shell_progress_begin ()

-
void                epc_shell_progress_begin            (const gchar *title,
-                                                         const gchar *message);
-

-Call this function before starting a lengthy operation to allow the -application tp provide some visual feedback during the operation, -and to generally keep its UI responsive. -

-

-This function calls your "begin" hook with title -as argument and "update" with message. -

-

-See also: epc_shell_set_progress_hooks(), epc_progress_window_install, -epc_shell_progress_update(), epc_shell_progress_end

-

-

-
-- - - - - - - - - - -

title :

 the title of the lengthy operation -

message :

 description of the lengthy operation -
-
-
-
-

epc_shell_progress_end ()

-
void                epc_shell_progress_end              (void);
-

-Call this function when your lengthy operation has finished. -

-

-See also: epc_shell_set_progress_hooks(), epc_progress_window_install, -epc_shell_progress_begin(), epc_shell_progress_update

-

-

-
-
-
-

epc_shell_progress_update ()

-
void                epc_shell_progress_update           (gdouble percentage,
-                                                         const gchar *message);
-

-Called this function to inform about progress of a lengthy operation. -The progress is expressed as percentage in the range [0..1], or -1 if the -progress cannot be estimated. -

-

-See also: epc_shell_set_progress_hooks(), epc_progress_window_install, -epc_shell_progress_begin, epc_shell_progress_end()

-

-

-
-- - - - - - - - - - -

percentage :

 current progress of the operation, or -1 -

message :

 a description of the current progress -
-
-
-
-

epc_shell_set_progress_hooks ()

-
void                epc_shell_set_progress_hooks        (const EpcShellProgressHooks *hooks,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data);
-

-Installs functions which are called during processing, such as generating -server keys. This allows the application to indicate progress and generally -keep its UI responsive. If no progress callbacks are provided, -or when NULL is passed for hooks, progress messages are written to the -console. -

-

-See also: EpcEntropyProgress

-

-

-
-- - - - - - - - - - - - - - -

hooks :

 the function table to install, or NULL -

user_data :

 custom data which shall be passed to the start hook -

destroy_data :

 function to call on user_data when the hooks are replaced -
-
-
-
-

EPC_AVAHI_ERROR

-
#define EPC_AVAHI_ERROR (epc_avahi_error_quark ())
-
-

-Error domain for Avahi operations. Errors in this -domain will be Avahi error codes. See GError -for information on error domains.

-

-

-
-
-
-

epc_shell_watch_avahi_client_state ()

-
guint               epc_shell_watch_avahi_client_state  (AvahiClientCallback callback,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data,
-                                                         GError **error);
-

-Registers a function to watch state changes of the library's AvahiClient. -On success the identifier of the newly created watch is returned. Pass it -to epc_shell_watch_remove() to remove the watch. On failure it returns 0 and -sets error. The error domain is EPC_AVAHI_ERROR. Possible error codes are -those of the Avahi library. -

-

-

-
-

Note

-

- Usually there is no need in handling the AVAHI_CLIENT_FAILURE state - for callback, as the callback dispatcher takes care already. This - state is dispatched mostly for notification purposes. -

-
-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

callback :

 a callback function -

user_data :

 data to pass to callback -

destroy_data :

 a function for freeing user_data when removing the watch -

error :

 return location for a GError, or NULL -

Returns :

 The identifier of the newly created watch, or 0 on error. -
-
-
-
-

epc_shell_create_avahi_entry_group ()

-
AvahiEntryGroup*    epc_shell_create_avahi_entry_group  (AvahiEntryGroupCallback callback,
-                                                         gpointer user_data);
-

-Creates a new AvahiEntryGroup for the library's shared AvahiClient. -On success the newly created AvahiEntryGroup is returned, -and NULL on failure.

-

-

-
-- - - - - - - - - - - - - - -

callback :

 a callback function -

user_data :

 data to pass to callback -

Returns :

 The newly created AvahiEntryGroup, or NULL on error. -
-
-
-
-

epc_shell_create_service_browser ()

-
AvahiServiceBrowser* epc_shell_create_service_browser   (AvahiIfIndex interface,
-                                                         AvahiProtocol protocol,
-                                                         const gchar *type,
-                                                         const gchar *domain,
-                                                         AvahiLookupFlags flags,
-                                                         AvahiServiceBrowserCallback callback,
-                                                         gpointer user_data,
-                                                         GError **error);
-

-Creates a new AvahiServiceBrowser for the library's shared AvahiClient. -On success the newly created AvahiEntryGroup is returned. On failure -NULL is returned and error is set. The error domain is EPC_AVAHI_ERROR. -Possible error codes are those of the Avahi library.

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

interface :

 the index of the network interface to watch -

protocol :

 the protocol of the services to watch -

type :

 the DNS-SD service type to watch -

domain :

 the DNS domain to watch, or NULL -

flags :

 flags for creating the service browser -

callback :

 a callback function -

user_data :

 data to pass to callback -

error :

 return location for a GError, or NULL -

Returns :

 The newly created AvahiServiceBrowser, or NULL on error. -
-
-
-
-

epc_shell_restart_avahi_client ()

-
void                epc_shell_restart_avahi_client      (const gchar *strloc);
-

-Requests restart of the builtin Avahi client. Use this function to react on -critical failures (like AVAHI_ENTRY_GROUP_FAILURE) reported to your Avahi -callbacks. The strloc argument is used to prevent endless restart cycles. -

-

-

-
-

Note

-

- Do not call this function to react on AVAHI_CLIENT_FAILURE in a - AvahiClientCallback. The builtin callback dispatcher deals with - that situation. -

-
-

-

-
-- - - - -

strloc :

 code location of the callee (G_STRLOC) -
-
-
-
-

epc_shell_get_host_name ()

-
const gchar*        epc_shell_get_host_name             (GError **error);
-

-Retrieves the official host name of this machine. On failure the function -returns NULL and sets error. The error domain is EPC_AVAHI_ERROR. -Possible error codes are those of the Avahi library.

-

-

-
-- - - - - - - - - - -

error :

 return location for a GError, or NULL -

Returns :

 The official host name, or NULL on error. -
-
-
-
-

epc_shell_watch_remove ()

-
void                epc_shell_watch_remove              (guint id);
-

-Removes the watching callback identified by id. -

-

-See also: epc_shell_watch_avahi_client()

-

-

-
-- - - - -

id :

 identifier of an watching callback -
-
-
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-EpcTls.html libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-EpcTls.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-EpcTls.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-EpcTls.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,452 @@ + + + + +EpcTls + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcTls

+

EpcTls — TLS support

+
+
+

Stability Level

+Private, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc/shell.h>
+
+#define             EPC_TLS_ERROR
+#define             EPC_TLS_SECONDS_PER_DAY
+#define             EPC_TLS_SECONDS_PER_HOUR
+#define             EPC_TLS_SECONDS_PER_MINUTE
+
+gnutls_x509_crt_t   epc_tls_certificate_load            (const gchar *filename,
+                                                         GError **error);
+gnutls_x509_crt_t   epc_tls_certificate_new             (const gchar *hostname,
+                                                         guint validity,
+                                                         gnutls_x509_privkey_t key,
+                                                         GError **error);
+gboolean            epc_tls_certificate_save            (gnutls_x509_crt_t certificate,
+                                                         const gchar *filename,
+                                                         GError **error);
+
+gnutls_x509_privkey_t epc_tls_private_key_load          (const gchar *filename,
+                                                         GError **error);
+gnutls_x509_privkey_t epc_tls_private_key_new           (GError **error);
+gboolean            epc_tls_private_key_save            (gnutls_x509_privkey_t key,
+                                                         const gchar *filename,
+                                                         GError **error);
+
+gchar *             epc_tls_get_private_key_filename    (const gchar *hostname);
+gchar *             epc_tls_get_certificate_filename    (const gchar *hostname);
+gboolean            epc_tls_get_server_credentials      (const gchar *hostname,
+                                                         gchar **crtfile,
+                                                         gchar **keyfile,
+                                                         GError **error);
+
+
+
+

Description

+

+Functions for handling TLS (X.509) certificates and keys. +

+
+
+

Details

+
+

EPC_TLS_ERROR

+
#define EPC_TLS_ERROR (epc_tls_error_quark ())
+
+

+Error domain for TLS operations. Errors in this domain will +be GNU TLS error codes. See GError +for information on error domains. +

+
+
+
+

EPC_TLS_SECONDS_PER_DAY

+
#define EPC_TLS_SECONDS_PER_DAY     (24 * EPC_TLS_SECONDS_PER_HOUR)
+
+

+The number of seconds per day. +

+
+
+
+

EPC_TLS_SECONDS_PER_HOUR

+
#define EPC_TLS_SECONDS_PER_HOUR    (60 * EPC_TLS_SECONDS_PER_MINUTE)
+
+

+The number of seconds per hour. +

+
+
+
+

EPC_TLS_SECONDS_PER_MINUTE

+
#define EPC_TLS_SECONDS_PER_MINUTE  (60)
+
+

+The number of seconds per minute. +

+
+
+
+

epc_tls_certificate_load ()

+
gnutls_x509_crt_t   epc_tls_certificate_load            (const gchar *filename,
+                                                         GError **error);
+

+Reads a PEM encoded X.509 certificate. +

+

+If the call was successful, the newly created certificate object is +returned. This key can be used with functions of the GNU +TLS library. If the call was not successful, it returns NULL +and sets error. The error domain is EPC_TLS_ERROR. Error codes are taken +from the GNU TLS library. +

+
++ + + + + + + + + + + + + + +

filename :

name of a file to read the certificate from, in the GLib file name encoding

error :

return location for a GError, or NULL +

Returns :

The newly created certificate object, or NULL.
+
+
+
+

epc_tls_certificate_new ()

+
gnutls_x509_crt_t   epc_tls_certificate_new             (const gchar *hostname,
+                                                         guint validity,
+                                                         gnutls_x509_privkey_t key,
+                                                         GError **error);
+

+Creates a self signed X.509 certificate. The certificate will mention +hostname as common name and as DNS host name, and it will be valid +for validity days. +

+

+If the call was successful, the newly created certificate is returned. This +certificate can be used with functions of the GNU TLS +library. If the call was not successful, it returns NULL and sets error. +The error domain is EPC_TLS_ERROR. Error codes are taken from the +GNU TLS library. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

hostname :

the name of the host that will use this certificate

validity :

the number of days the certificate will remain valid

key :

the private key for signing the certificate

error :

return location for a GError, or NULL +

Returns :

The newly created certificate object, or NULL.
+
+
+
+

epc_tls_certificate_save ()

+
gboolean            epc_tls_certificate_save            (gnutls_x509_crt_t certificate,
+                                                         const gchar *filename,
+                                                         GError **error);
+

+Writes a PEM encoded X.509 certificate. +

+

+If the call was successful, it returns TRUE. If the call was not +successful, it returns FALSE and sets error. The error domain is +EPC_TLS_ERROR. Error codes are taken from the GNU +TLS library. +

+
++ + + + + + + + + + + + + + + + + + +

certificate :

a X.509 certificate

filename :

name of a file to write the certificate to, in the GLib file name encoding

error :

return location for a GError, or NULL +

Returns :

 +TRUE on successful, FALSE if an error occurred
+
+
+
+

epc_tls_private_key_load ()

+
gnutls_x509_privkey_t epc_tls_private_key_load          (const gchar *filename,
+                                                         GError **error);
+

+Reads a PEM encoded private X.509 key. +

+

+If the call was successful, the newly created private key object is +returned. This key can be used with functions of the GNU +TLS library. If the call was not successful, it returns NULL +and sets error. The error domain is EPC_TLS_ERROR. Error codes are taken +from the GNU TLS library. +

+
++ + + + + + + + + + + + + + +

filename :

name of a file to read the key from, in the GLib file name encoding

error :

return location for a GError, or NULL +

Returns :

The newly created key object, or NULL.
+
+
+
+

epc_tls_private_key_new ()

+
gnutls_x509_privkey_t epc_tls_private_key_new           (GError **error);
+

+Creates a self private X.509 key. Generating secure keys needs quite +some time. Call epc_tls_set_private_key_hooks() to install hooks providing +some feedback to your users. Key generation takes place in a separate +background thread, whilst the calling thread waits in a GMainLoop. So +for instance the GTK+ widget system remains responsible during that +phase. +

+

+If the call was successful, the newly created key is returned. This +certificate can be used with functions of the GNU TLS +library. If the call was not successful, it returns NULL and sets error. +The error domain is EPC_TLS_ERROR. Error codes are taken from the +GNU TLS library. +

+

+See also: EpcEntropyProgress +

+
++ + + + + + + + + + +

error :

return location for a GError, or NULL +

Returns :

The newly created private key object, or NULL.
+
+
+
+

epc_tls_private_key_save ()

+
gboolean            epc_tls_private_key_save            (gnutls_x509_privkey_t key,
+                                                         const gchar *filename,
+                                                         GError **error);
+

+Writes a PEM encoded private X.509 key. +

+

+If the call was successful, it returns TRUE. If the call was not +successful, it returns FALSE and sets error. The error domain is +EPC_TLS_ERROR. Error codes are taken from the GNU +TLS library. +

+
++ + + + + + + + + + + + + + + + + + +

key :

a private X.509 key

filename :

name of a file to write the private key to, in the GLib file name encoding

error :

return location for a GError, or NULL +

Returns :

 +TRUE on successful, FALSE if an error occured
+
+
+
+

epc_tls_get_private_key_filename ()

+
gchar *             epc_tls_get_private_key_filename    (const gchar *hostname);
+

+Queries the preferred location for storing private X.509 keys for the server +identified by hostname. This file is located in the current user's XDG +configuration folder (g_get_user_config_dir()). The filename also contains +program's name when specified by g_set_prgname(). +

+
++ + + + + + + + + + +

hostname :

the server's host name

Returns :

The preferred private key location for hostname.
+
+
+
+

epc_tls_get_certificate_filename ()

+
gchar *             epc_tls_get_certificate_filename    (const gchar *hostname);
+

+Queries the preferred location for storing X.509 certificates for the server +identified by hostname. This file is located in the current user's XDG +configuration folder (g_get_user_config_dir()). The filename also contains +program's name when specified by g_set_prgname(). +

+
++ + + + + + + + + + +

hostname :

the server's host name

Returns :

The preferred certificate location for hostname.
+
+
+
+

epc_tls_get_server_credentials ()

+
gboolean            epc_tls_get_server_credentials      (const gchar *hostname,
+                                                         gchar **crtfile,
+                                                         gchar **keyfile,
+                                                         GError **error);
+

+Searches or creates X.509 certificate and key for the server identified +by hostname. This function uses epc_tls_get_certificate_filename() and +epc_tls_get_private_key_filename() to locate existing certificates and +keys. New certificates and keys are generated, when the files cannot +be found, or the existing files contain invalid or expired information. +

+

+If the call was successful, it returns TRUE. If the call was not +successful, it returns FALSE and sets error. The error domain is +EPC_TLS_ERROR. Error codes are taken from the GNU +TLS library. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

hostname :

the server's host name

crtfile :

location for storing the certificate's filename in GLib filename encoding

keyfile :

location for storing the private key's filename in GLib filename encoding

error :

return location for a GError, or NULL +

Returns :

 +TRUE on successful, FALSE if an error occurred
+
+
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcTls.html libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcTls.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-10-EpcTls.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-10-EpcTls.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,606 +0,0 @@ - - - - -EpcTls - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EpcTls

-

EpcTls — TLS support

-
-
-

Stability Level

-Private, unless otherwise indicated -
-
-

Synopsis

-
-
-#include <libepc/shell.h>
-
-#define             EPC_TLS_ERROR
-#define             EPC_TLS_SECONDS_PER_DAY
-#define             EPC_TLS_SECONDS_PER_HOUR
-#define             EPC_TLS_SECONDS_PER_MINUTE
-
-gnutls_x509_crt_t   epc_tls_certificate_load            (const gchar *filename,
-                                                         GError **error);
-gnutls_x509_crt_t   epc_tls_certificate_new             (const gchar *hostname,
-                                                         guint validity,
-                                                         gnutls_x509_privkey_t key,
-                                                         GError **error);
-gboolean            epc_tls_certificate_save            (gnutls_x509_crt_t certificate,
-                                                         const gchar *filename,
-                                                         GError **error);
-
-gnutls_x509_privkey_t  epc_tls_private_key_load         (const gchar *filename,
-                                                         GError **error);
-gnutls_x509_privkey_t  epc_tls_private_key_new          (GError **error);
-gboolean            epc_tls_private_key_save            (gnutls_x509_privkey_t key,
-                                                         const gchar *filename,
-                                                         GError **error);
-
-gchar*              epc_tls_get_private_key_filename    (const gchar *hostname);
-gchar*              epc_tls_get_certificate_filename    (const gchar *hostname);
-gboolean            epc_tls_get_server_credentials      (const gchar *hostname,
-                                                         gchar **crtfile,
-                                                         gchar **keyfile,
-                                                         GError **error);
-
-
-
-

Description

-

-Functions for handling TLS (X.509) certificates and keys.

-

-

-
-
-

Details

-
-

EPC_TLS_ERROR

-
#define EPC_TLS_ERROR (epc_tls_error_quark ())
-
-

-Error domain for TLS operations. Errors in this domain will -be GNU TLS error codes. See GError -for information on error domains.

-

-

-
-
-
-

EPC_TLS_SECONDS_PER_DAY

-
#define EPC_TLS_SECONDS_PER_DAY     (24 * EPC_TLS_SECONDS_PER_HOUR)
-
-

-The number of seconds per day.

-

-

-
-
-
-

EPC_TLS_SECONDS_PER_HOUR

-
#define EPC_TLS_SECONDS_PER_HOUR    (60 * EPC_TLS_SECONDS_PER_MINUTE)
-
-

-The number of seconds per hour.

-

-

-
-
-
-

EPC_TLS_SECONDS_PER_MINUTE

-
#define EPC_TLS_SECONDS_PER_MINUTE  (60)
-
-

-The number of seconds per minute.

-

-

-
-
-
-

epc_tls_certificate_load ()

-
gnutls_x509_crt_t   epc_tls_certificate_load            (const gchar *filename,
-                                                         GError **error);
-

-Reads a PEM encoded X.509 certificate. -

-

-If the call was successful, the newly created certificate object is -returned. This key can be used with functions of the GNU -TLS library. If the call was not successful, it returns NULL -and sets error. The error domain is EPC_TLS_ERROR. Error codes are taken -from the GNU TLS library.

-

-

-
-- - - - - - - - - - - - - - -

filename :

 name of a file to read the certificate from, in the GLib file name encoding -

error :

 return location for a GError, or NULL -

Returns :

 The newly created certificate object, or NULL. -
-
-
-
-

epc_tls_certificate_new ()

-
gnutls_x509_crt_t   epc_tls_certificate_new             (const gchar *hostname,
-                                                         guint validity,
-                                                         gnutls_x509_privkey_t key,
-                                                         GError **error);
-

-Creates a self signed X.509 certificate. The certificate will mention -hostname as common name and as DNS host name, and it will be valid -for validity days. -

-

-If the call was successful, the newly created certificate is returned. This -certificate can be used with functions of the GNU TLS -library. If the call was not successful, it returns NULL and sets error. -The error domain is EPC_TLS_ERROR. Error codes are taken from the -GNU TLS library.

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

hostname :

 the name of the host that will use this certificate -

validity :

 the number of days the certificate will remain valid -

key :

 the private key for signing the certificate -

error :

 return location for a GError, or NULL -

Returns :

 The newly created certificate object, or NULL. -
-
-
-
-

epc_tls_certificate_save ()

-
gboolean            epc_tls_certificate_save            (gnutls_x509_crt_t certificate,
-                                                         const gchar *filename,
-                                                         GError **error);
-

-Writes a PEM encoded X.509 certificate. -

-

-If the call was successful, it returns TRUE. If the call was not -successful, it returns FALSE and sets error. The error domain is -EPC_TLS_ERROR. Error codes are taken from the GNU -TLS library.

-

-

-
-- - - - - - - - - - - - - - - - - - -

certificate :

 a X.509 certificate -

filename :

 name of a file to write the certificate to, in the GLib file name encoding -

error :

 return location for a GError, or NULL -

Returns :

 TRUE on successful, FALSE if an error occurred -
-
-
-
-

epc_tls_private_key_load ()

-
gnutls_x509_privkey_t  epc_tls_private_key_load         (const gchar *filename,
-                                                         GError **error);
-

-Reads a PEM encoded private X.509 key. -

-

-If the call was successful, the newly created private key object is -returned. This key can be used with functions of the GNU -TLS library. If the call was not successful, it returns NULL -and sets error. The error domain is EPC_TLS_ERROR. Error codes are taken -from the GNU TLS library.

-

-

-
-- - - - - - - - - - - - - - -

filename :

 name of a file to read the key from, in the GLib file name encoding -

error :

 return location for a GError, or NULL -

Returns :

 The newly created key object, or NULL. -
-
-
-
-

epc_tls_private_key_new ()

-
gnutls_x509_privkey_t  epc_tls_private_key_new          (GError **error);
-

-Creates a self private X.509 key. Generating secure keys needs quite -some time. Call epc_tls_set_private_key_hooks() to install hooks providing -some feedback to your users. Key generation takes place in a separate -background thread, whilst the calling thread waits in a GMainLoop. So -for instance the GTK+ widget system remains responsible during that -phase. -

-

-If the call was successful, the newly created key is returned. This -certificate can be used with functions of the GNU TLS -library. If the call was not successful, it returns NULL and sets error. -The error domain is EPC_TLS_ERROR. Error codes are taken from the -GNU TLS library. -

-

-See also: EpcEntropyProgress

-

-

-
-- - - - - - - - - - -

error :

 return location for a GError, or NULL -

Returns :

 The newly created private key object, or NULL. -
-
-
-
-

epc_tls_private_key_save ()

-
gboolean            epc_tls_private_key_save            (gnutls_x509_privkey_t key,
-                                                         const gchar *filename,
-                                                         GError **error);
-

-Writes a PEM encoded private X.509 key. -

-

-If the call was successful, it returns TRUE. If the call was not -successful, it returns FALSE and sets error. The error domain is -EPC_TLS_ERROR. Error codes are taken from the GNU -TLS library.

-

-

-
-- - - - - - - - - - - - - - - - - - -

key :

 a private X.509 key -

filename :

 name of a file to write the private key to, in the GLib file name encoding -

error :

 return location for a GError, or NULL -

Returns :

 TRUE on successful, FALSE if an error occured -
-
-
-
-

epc_tls_get_private_key_filename ()

-
gchar*              epc_tls_get_private_key_filename    (const gchar *hostname);
-

-Queries the preferred location for storing private X.509 keys for the server -identified by hostname. This file is located in the current user's XDG -configuration folder (g_get_user_config_dir()). The filename also contains -program's name when specified by g_set_prgname().

-

-

-
-- - - - - - - - - - -

hostname :

 the server's host name -

Returns :

 The preferred private key location for hostname. -
-
-
-
-

epc_tls_get_certificate_filename ()

-
gchar*              epc_tls_get_certificate_filename    (const gchar *hostname);
-

-Queries the preferred location for storing X.509 certificates for the server -identified by hostname. This file is located in the current user's XDG -configuration folder (g_get_user_config_dir()). The filename also contains -program's name when specified by g_set_prgname().

-

-

-
-- - - - - - - - - - -

hostname :

 the server's host name -

Returns :

 The preferred certificate location for hostname. -
-
-
-
-

epc_tls_get_server_credentials ()

-
gboolean            epc_tls_get_server_credentials      (const gchar *hostname,
-                                                         gchar **crtfile,
-                                                         gchar **keyfile,
-                                                         GError **error);
-

-Searches or creates X.509 certificate and key for the server identified -by hostname. This function uses epc_tls_get_certificate_filename() and -epc_tls_get_private_key_filename() to locate existing certificates and -keys. New certificates and keys are generated, when the files cannot -be found, or the existing files contain invalid or expired information. -

-

-If the call was successful, it returns TRUE. If the call was not -successful, it returns FALSE and sets error. The error domain is -EPC_TLS_ERROR. Error codes are taken from the GNU -TLS library.

-

-

-
-- - - - - - - - - - - - - - - - - - - - - - -

hostname :

 the server's host name -

crtfile :

 location for storing the certificate's filename in GLib filename encoding -

keyfile :

 location for storing the private key's filename in GLib filename encoding -

error :

 return location for a GError, or NULL -

Returns :

 TRUE on successful, FALSE if an error occurred -
-
-
-
-
-
- Generated by GTK-Doc V1.11
- - diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-password-dialog.html libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-password-dialog.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-password-dialog.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-password-dialog.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,516 @@ + + + + +EpcPasswordDialog + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcPasswordDialog

+

EpcPasswordDialog — common password dialog

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc-ui/password-dialog.h>
+
+struct              EpcPasswordDialogClass;
+                    EpcPasswordDialogPrivate;
+struct              EpcPasswordDialog;
+
+GtkWidget *         epc_password_dialog_new             (const gchar *title,
+                                                         GtkWindow *parent,
+                                                         const gchar *realm,
+                                                         const gchar *first_button_text,
+                                                         ...);
+
+void                epc_password_dialog_set_anonymous_allowed
+                                                        (EpcPasswordDialog *dialog,
+                                                         gboolean allowed);
+gboolean            epc_password_dialog_get_anonymous_allowed
+                                                        (EpcPasswordDialog *dialog);
+void                epc_password_dialog_set_anonymous   (EpcPasswordDialog *dialog,
+                                                         gboolean anonymous);
+gboolean            epc_password_dialog_is_anonymous    (EpcPasswordDialog *dialog);
+void                epc_password_dialog_set_username    (EpcPasswordDialog *dialog,
+                                                         const gchar *username);
+const gchar *       epc_password_dialog_get_username    (EpcPasswordDialog *dialog);
+void                epc_password_dialog_set_password    (EpcPasswordDialog *dialog,
+                                                         const gchar *password);
+const gchar *       epc_password_dialog_get_password    (EpcPasswordDialog *dialog);
+void                epc_password_dialog_set_realm       (EpcPasswordDialog *dialog,
+                                                         const gchar *realm);
+const gchar *       epc_password_dialog_get_realm       (EpcPasswordDialog *dialog);
+
+void                epc_password_dialog_attach          (EpcPasswordDialog *dialog,
+                                                         EpcConsumer *consumer);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----GInitiallyUnowned
+         +----GtkWidget
+               +----GtkContainer
+                     +----GtkBin
+                           +----GtkWindow
+                                 +----GtkDialog
+                                       +----EpcPasswordDialog
+
+
+
+

Implemented Interfaces

+

+EpcPasswordDialog implements + AtkImplementorIface and GtkBuildable.

+
+
+

Properties

+
+  "anonymous"                gboolean              : Read / Write / Construct
+  "anonymous-allowed"        gboolean              : Read / Write / Construct
+  "password"                 gchar*                : Read / Write / Construct
+  "realm"                    gchar*                : Read / Write / Construct
+  "username"                 gchar*                : Read / Write / Construct
+
+
+
+

Description

+

+The EpcPasswordDialog provides an user interface +for the most common authentication scenarios. +

+
+
+

Details

+
+

struct EpcPasswordDialogClass

+
struct EpcPasswordDialogClass {
+};
+
+

+Virtual methods of the EpcPasswordDialog class. +

+
+
+
+

EpcPasswordDialogPrivate

+
typedef struct _EpcPasswordDialogPrivate EpcPasswordDialogPrivate;
+

+Private fields of the EpcPasswordDialog class. +

+
+
+
+

struct EpcPasswordDialog

+
struct EpcPasswordDialog;
+

+Public fields of the EpcPasswordDialog class. +

+
+
+
+

epc_password_dialog_new ()

+
GtkWidget *         epc_password_dialog_new             (const gchar *title,
+                                                         GtkWindow *parent,
+                                                         const gchar *realm,
+                                                         const gchar *first_button_text,
+                                                         ...);
+

+Creates a new EpcPasswordDialog instance. +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + +

title :

title of the dialog, or NULL +

parent :

transient parent of the dialog, or NULL +

realm :

authentication realm, or NULL +

first_button_text :

stock ID or text to go in first button, or NULL +

... :

response ID for first button, then additional buttons, ending with NULL

Returns :

The newly created EpcEntropyWindow.
+
+
+
+

epc_password_dialog_set_anonymous_allowed ()

+
void                epc_password_dialog_set_anonymous_allowed
+                                                        (EpcPasswordDialog *dialog,
+                                                         gboolean allowed);
+

+Toggles anonymous authentication support. With anonymous authentication +support an aditional checkbox for requesting anonymous authentication is +shown. See "anonymous-allowed" for details. +

+

+See also: epc_password_dialog_set_anonymous() +

+
++ + + + + + + + + + +

dialog :

a EpcPasswordDialog +

allowed :

the new anonymous authentication support flag
+
+
+
+

epc_password_dialog_get_anonymous_allowed ()

+
gboolean            epc_password_dialog_get_anonymous_allowed
+                                                        (EpcPasswordDialog *dialog);
+

+Queries if anonymous authentication is supported. With anonymous +authentication support an aditional checkbox for requesting anonymous +authentication is shown. See "anonymous-allowed" for +details. +

+

+See also: epc_password_dialog_is_anonymous() +

+
++ + + + + + + + + + +

dialog :

a EpcPasswordDialog +

Returns :

 +TRUE if anonymous authentication is supported.
+
+
+
+

epc_password_dialog_set_anonymous ()

+
void                epc_password_dialog_set_anonymous   (EpcPasswordDialog *dialog,
+                                                         gboolean anonymous);
+

+See also: epc_password_dialog_set_anonymous_allowed() +

+

+Changes the anonymous authentication state. +See "anonymous" for details. +

+
++ + + + + + + + + + +

dialog :

a EpcPasswordDialog +

anonymous :

the new anonymous authentication state
+
+
+
+

epc_password_dialog_is_anonymous ()

+
gboolean            epc_password_dialog_is_anonymous    (EpcPasswordDialog *dialog);
+

+Queries if anonymous authentication is requested. +See "anonymous" for details. +

+

+See also: epc_password_dialog_get_anonymous_allowed() +

+
++ + + + + + + + + + +

dialog :

a EpcPasswordDialog +

Returns :

 +TRUE if anonymous authentication is requested.
+
+
+
+

epc_password_dialog_set_username ()

+
void                epc_password_dialog_set_username    (EpcPasswordDialog *dialog,
+                                                         const gchar *username);
+

+Changes the current user name of the dialog. +See "username" for details. +

+
++ + + + + + + + + + +

dialog :

a EpcPasswordDialog +

username :

the new username
+
+
+
+

epc_password_dialog_get_username ()

+
const gchar *       epc_password_dialog_get_username    (EpcPasswordDialog *dialog);
+

+Queries the current user name of the dialog. +See "username" for details. +

+
++ + + + + + + + + + +

dialog :

a EpcPasswordDialog +

Returns :

the current user name of the dialog.
+
+
+
+

epc_password_dialog_set_password ()

+
void                epc_password_dialog_set_password    (EpcPasswordDialog *dialog,
+                                                         const gchar *password);
+

+Changes the current password of the dialog. +See "password" for details. +

+
++ + + + + + + + + + +

dialog :

a EpcPasswordDialog +

password :

the new password
+
+
+
+

epc_password_dialog_get_password ()

+
const gchar *       epc_password_dialog_get_password    (EpcPasswordDialog *dialog);
+

+Queries the current password of the dialog. +See "password" for details. +

+
++ + + + + + + + + + +

dialog :

a EpcPasswordDialog +

Returns :

the current password of the dialog.
+
+
+
+

epc_password_dialog_set_realm ()

+
void                epc_password_dialog_set_realm       (EpcPasswordDialog *dialog,
+                                                         const gchar *realm);
+

+Changes the authentication realm the dialog shows. +See "realm" for details. +

+
++ + + + + + + + + + +

dialog :

a EpcPasswordDialog +

realm :

the new realm
+
+
+
+

epc_password_dialog_get_realm ()

+
const gchar *       epc_password_dialog_get_realm       (EpcPasswordDialog *dialog);
+

+Queries the authentication realm of the dialog. +See "realm" for details. +

+
++ + + + + + + + + + +

dialog :

a EpcPasswordDialog +

Returns :

the current realm of the dialog.
+
+
+
+

epc_password_dialog_attach ()

+
void                epc_password_dialog_attach          (EpcPasswordDialog *dialog,
+                                                         EpcConsumer *consumer);
+

+Installs a EpcPasswordDialog as authentication handler for some +EpcConsumer by connecting to its "authenticate" and +"reauthenticate" signals. +

+
++ + + + + + + + + + +

dialog :

a EpcPasswordDialog +

consumer :

the EpcConsumer +
+
+
+
+

Property Details

+
+

The "anonymous" property

+
  "anonymous"                gboolean              : Read / Write / Construct
+

Try to use anonymous authentication.

+

Default value: FALSE

+
+
+
+

The "anonymous-allowed" property

+
  "anonymous-allowed"        gboolean              : Read / Write / Construct
+

Show widget to allow anonymous authentication.

+

Default value: TRUE

+
+
+
+

The "password" property

+
  "password"                 gchar*                : Read / Write / Construct
+

The password to use for authentication.

+

Default value: NULL

+
+
+
+

The "realm" property

+
  "realm"                    gchar*                : Read / Write / Construct
+

The authentication realm the dialog is used for.

+

Default value: NULL

+
+
+
+

The "username" property

+
  "username"                 gchar*                : Read / Write / Construct
+

The username to use for authentication.

+

Default value: "murrayc"

+
+
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-progress-window.html libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-progress-window.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-progress-window.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-progress-window.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,244 @@ + + + + +EpcProgressWindow + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcProgressWindow

+

EpcProgressWindow — provide feedback during lengthly operations

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc-ui/progress-window.h>
+
+struct              EpcProgressWindowClass;
+                    EpcProgressWindowPrivate;
+struct              EpcProgressWindow;
+GtkWidget *         epc_progress_window_new             (const gchar *title,
+                                                         GtkWindow *parent,
+                                                         const gchar *message);
+void                epc_progress_window_update          (EpcProgressWindow *window,
+                                                         gdouble progress,
+                                                         const gchar *message);
+void                epc_progress_window_install         (GtkWindow *parent);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----GInitiallyUnowned
+         +----GtkWidget
+               +----GtkContainer
+                     +----GtkBin
+                           +----GtkWindow
+                                 +----EpcProgressWindow
+
+
+
+

Implemented Interfaces

+

+EpcProgressWindow implements + AtkImplementorIface and GtkBuildable.

+
+
+

Properties

+
+  "message"                  gchar*                : Read / Write / Construct
+  "progress"                 gdouble               : Read / Write / Construct
+  "title"                    gchar*                : Read / Write / Construct
+
+
+
+

Description

+

+The EpcProgressWindow can be used to provide some feedback during +lengthly operations, like generating server keys. +

+

+See also: epc_tls_private_key_new() +

+
+
+

Details

+
+

struct EpcProgressWindowClass

+
struct EpcProgressWindowClass {
+};
+
+

+Virtual methods of the EpcProgressWindow class. +

+
+
+
+

EpcProgressWindowPrivate

+
typedef struct _EpcProgressWindowPrivate EpcProgressWindowPrivate;
+

+Private fields of the EpcProgressWindow class. +

+
+
+
+

struct EpcProgressWindow

+
struct EpcProgressWindow;
+

+Public fields of the EpcProgressWindow class. +

+
+
+
+

epc_progress_window_new ()

+
GtkWidget *         epc_progress_window_new             (const gchar *title,
+                                                         GtkWindow *parent,
+                                                         const gchar *message);
+

+Creates a new EpcProgressWindow instance. +

+
++ + + + + + + + + + + + + + + + + + +

title :

the title of the window

parent :

the transient parent of the window, or NULL +

message :

the message to show, or NULL +

Returns :

The newly created EpcProgressWindow.
+
+
+
+

epc_progress_window_update ()

+
void                epc_progress_window_update          (EpcProgressWindow *window,
+                                                         gdouble progress,
+                                                         const gchar *message);
+

+Updates the EpcProgressWindow with new progress information. The progress +is expressed as percentage in the range [0..1], or -1 if the progress cannot +be estimated. +

+

+See also: "message", "progress" +

+
++ + + + + + + + + + + + + + +

window :

a EpcProgressWindow +

progress :

the current progress, or -1

message :

a description of the current progress
+
+
+
+

epc_progress_window_install ()

+
void                epc_progress_window_install         (GtkWindow *parent);
+

+Configures the hooks provided by libepc to use EpcProgressWindow when for +performing long standing tasks like for instance generating private keys. +

+

+See also: epc_tls_set_private_key_hooks() +

+
++ + + + +

parent :

the transient parent of the window, or NULL +
+
+
+
+

Property Details

+
+

The "message" property

+
  "message"                  gchar*                : Read / Write / Construct
+

The progress message to show.

+

Default value: NULL

+
+
+
+

The "progress" property

+
  "progress"                 gdouble               : Read / Write / Construct
+

Current progress, or -1.

+

Allowed values: [-1,1]

+

Default value: -1

+
+
+
+

The "title" property

+
  "title"                    gchar*                : Read / Write / Construct
+

The title to show.

+

Default value: NULL

+
+
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-publisher.html libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-publisher.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-publisher.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-publisher.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,1432 @@ + + + + +EpcPublisher + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcPublisher

+

EpcPublisher — easily publish values

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc/publish.h>
+
+EpcContents *       (*EpcContentsHandler)               (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         gpointer user_data);
+                    EpcPublisherPrivate;
+struct              EpcPublisherClass;
+struct              EpcPublisher;
+
+EpcPublisher *      epc_publisher_new                   (const gchar *name,
+                                                         const gchar *application,
+                                                         const gchar *domain);
+
+void                epc_publisher_add                   (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         gconstpointer data,
+                                                         gssize length);
+void                epc_publisher_add_file              (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         const gchar *filename);
+void                epc_publisher_add_handler           (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         EpcContentsHandler handler,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy_data);
+void                epc_publisher_add_bookmark          (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         const gchar *label);
+gchar *             epc_publisher_get_path              (EpcPublisher *publisher,
+                                                         const gchar *key);
+gchar *             epc_publisher_get_uri               (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         GError **error);
+gboolean            epc_publisher_has_key               (EpcPublisher *publisher,
+                                                         const gchar *key);
+gpointer            epc_publisher_lookup                (EpcPublisher *publisher,
+                                                         const gchar *key);
+gboolean            epc_publisher_remove                (EpcPublisher *publisher,
+                                                         const gchar *key);
+GList *             epc_publisher_list                  (EpcPublisher *publisher,
+                                                         const gchar *pattern);
+
+gboolean            epc_publisher_run                   (EpcPublisher *publisher,
+                                                         GError **error);
+gboolean            epc_publisher_run_async             (EpcPublisher *publisher,
+                                                         GError **error);
+gboolean            epc_publisher_quit                  (EpcPublisher *publisher);
+
+gchar *             epc_publisher_expand_name           (const gchar *name,
+                                                         GError **error);
+
+void                epc_publisher_set_auth_flags        (EpcPublisher *publisher,
+                                                         EpcAuthFlags flags);
+void                epc_publisher_set_auth_handler      (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         EpcAuthHandler handler,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy_data);
+void                epc_publisher_set_collision_handling
+                                                        (EpcPublisher *publisher,
+                                                         EpcCollisionHandling method);
+void                epc_publisher_set_contents_path     (EpcPublisher *publisher,
+                                                         const gchar *path);
+void                epc_publisher_set_credentials       (EpcPublisher *publisher,
+                                                         const gchar *certfile,
+                                                         const gchar *keyfile);
+void                epc_publisher_set_protocol          (EpcPublisher *publisher,
+                                                         EpcProtocol protocol);
+void                epc_publisher_set_service_cookie    (EpcPublisher *publisher,
+                                                         const gchar *cookie);
+void                epc_publisher_set_service_name      (EpcPublisher *publisher,
+                                                         const gchar *name);
+
+EpcAuthFlags        epc_publisher_get_auth_flags        (EpcPublisher *publisher);
+const gchar *       epc_publisher_get_certificate_file  (EpcPublisher *publisher);
+EpcCollisionHandling epc_publisher_get_collision_handling
+                                                        (EpcPublisher *publisher);
+const gchar *       epc_publisher_get_contents_path     (EpcPublisher *publisher);
+const gchar *       epc_publisher_get_private_key_file  (EpcPublisher *publisher);
+EpcProtocol         epc_publisher_get_protocol          (EpcPublisher *publisher);
+const gchar *       epc_publisher_get_service_cookie    (EpcPublisher *publisher);
+const gchar *       epc_publisher_get_service_domain    (EpcPublisher *publisher);
+const gchar *       epc_publisher_get_service_name      (EpcPublisher *publisher);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----EpcPublisher
+
+
+
+

Properties

+
+  "application"              gchar*                : Read / Write / Construct
+  "auth-flags"               EpcAuthFlags          : Read / Write / Construct
+  "certificate-file"         gchar*                : Read / Write / Construct
+  "collision-handling"       EpcCollisionHandling  : Read / Write / Construct
+  "contents-path"            gchar*                : Read / Write / Construct
+  "private-key-file"         gchar*                : Read / Write / Construct
+  "protocol"                 EpcProtocol           : Read / Write / Construct
+  "service-cookie"           gchar*                : Read / Write / Construct
+  "service-domain"           gchar*                : Read / Write / Construct
+  "service-name"             gchar*                : Read / Write / Construct
+
+
+
+

Description

+

+The EpcPublisher starts a HTTP server to publish information. +To allow EpcConsumer to find the publisher it automatically publishes +its contact information (host name, TCP/IP port) per DNS-SD. +

+

+In future it might use DNS-DS to notify EpcConsumer of changes. +

+

+

+
+

Example 6. Publish a value

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
publisher = epc_publisher_new ("Easy Publisher Example", NULL, NULL);
+
+epc_publisher_add (publisher, "maman", "bar", -1);
+epc_publisher_add_file (publisher, "source-code", __FILE__);
+
+epc_publisher_run (NULL);
+
+ +
+


+

+

+EpcPublisher doesn't provide a way to explicitly publish NULL values, as +publishing NULL values doesn't seem very valueable in our scenario: Usually +you want to "publish" NULL values to express, that your application doesn't +have any meaningful information for the requested identifier. By "publishing" +a NULL value essentially you say "this information does not exist". So +publishing NULL values is not different from not publishing any value at +all or rejected access to some values. Without explicitly inspecting the +details for not receiving a value, a consumer calling epc_consumer_lookup() +has no chance to distinguish between the cases "never published", "network +problem", "authorization rejected", "no meaningful value available". +

+

+So if feel like publishing a NULL value, just remove the key in question +from the EpcPublisher by calling epc_publisher_remove(). When using a +custom EpcContentsHandler an alternate approach is returning NULL from +that handler. In that case the EpcPublisher will behave exactly the same, +as if the value has been removed. +

+
+
+

Details

+
+

EpcContentsHandler ()

+
EpcContents *       (*EpcContentsHandler)               (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         gpointer user_data);
+

+This callback is used to generate custom contents published with the +epc_publisher_add_handler function. The arguments passed are the same as +passed to epc_publisher_add_handler. The EpcPublisher will decrease the +reference count of the returned buffer after deliving it. It's valid to +return NULL in situations were no contents can be generated. +

+
++ + + + + + + + + + + + + + + + + + +

publisher :

the EpcPublisher +

key :

the unique key

user_data :

user data set when the signal handler was installed

Returns :

The EpcContents buffer for this publication, or NULL.
+
+
+
+

EpcPublisherPrivate

+
typedef struct _EpcPublisherPrivate EpcPublisherPrivate;
+

+Private fields of the EpcPublisher class. +

+
+
+
+

struct EpcPublisherClass

+
struct EpcPublisherClass {
+};
+
+

+Virtual methods of the EpcPublisher class. +

+
+
+
+

struct EpcPublisher

+
struct EpcPublisher;
+

+Public fields of the EpcPublisher class. +

+
+
+
+

epc_publisher_new ()

+
EpcPublisher *      epc_publisher_new                   (const gchar *name,
+                                                         const gchar *application,
+                                                         const gchar *domain);
+

+Creates a new EpcPublisher object. The publisher announces its service +per DNS-SD to the DNS domain specified by domain, using name as service +name. The service type is derived from application. When NULL is passed +for application the value returned by g_get_prgname() is used. See +epc_service_type_new() for details. +

+
++ + + + + + + + + + + + + + + + + + +

name :

the human friendly service name, or NULL +

application :

application name used for DNS-SD service type, or NULL +

domain :

the DNS domain for announcing the service, or NULL +

Returns :

The newly created EpcPublisher object.
+
+
+
+

epc_publisher_add ()

+
void                epc_publisher_add                   (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         gconstpointer data,
+                                                         gssize length);
+

+Publishes a new value on the EpcPublisher using the unique key for +addressing. When -1 is passed for length, data is expected to be a +null-terminated string and its length in bytes is determined automatically +using strlen. +

+

+

+
+

Note

+

+ Values published by the EpcPublisher can be arbitrary data, possibly + including null characters in the middle. The kind of data associated + with a key is chosen by the application providing values and should + be specified separately. +

+

+ However, when publishing plain text it is strongly recommended + to use UTF-8 encoding to avoid internationalization issues. +

+
+

+

+
++ + + + + + + + + + + + + + + + + + +

publisher :

a EpcPublisher +

key :

the key for addressing the value

data :

the value to publish

length :

the length of data in bytes, or -1 if data is a null-terminated string.
+
+
+
+

epc_publisher_add_file ()

+
void                epc_publisher_add_file              (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         const gchar *filename);
+

+Publishes a local file on the EpcPublisher using the unique +key for addressing. The publisher delivers the current contents +of the file at the time of access. +

+
++ + + + + + + + + + + + + + +

publisher :

a EpcPublisher +

key :

the key for addressing the file

filename :

the name of the file to publish
+
+
+
+

epc_publisher_add_handler ()

+
void                epc_publisher_add_handler           (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         EpcContentsHandler handler,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy_data);
+

+Publishes contents on the EpcPublisher which are generated by a custom +EpcContentsHandler callback. This is the most flexible method for publishing +information. +

+

+The handler is called on every request matching key. +When called, publisher, key and user_data are passed to the handler. +When replacing or deleting the resource referenced by key, +or when the the Publisher is destroyed, the function +described by destroy_data is called with user_data as argument. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

publisher :

a EpcPublisher +

key :

the key for addressing the contents

handler :

the EpcContentsHandler for handling this contents

user_data :

data to pass on handler calls

destroy_data :

a function for releasing user_data +
+
+
+
+

epc_publisher_add_bookmark ()

+
void                epc_publisher_add_bookmark          (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         const gchar *label);
+

+Installs a dynamic HTTP (respectively HTTPS) bookmark for key. +This allows consumption of EpcPublisher resources by foreign +applications that support ZeroConf bookmarks, but not libepc. +This is useful for instance for publishing media playlists. +

+

+Passing NULL as key installs a bookmark for the root context of the +builtin web server. When passing NULL as label the publisher's name +is used as bookmark label. +

+

+

+
+

Note

+

+ Dynamic bookmarks must be unique within the service domain. + Therefore the label will get modified on name collisions. +

+
+

+

+

+

+
+

Note

+

+ This should be called after adding the resource identified by key, + not before. For instance, after calling epc_publisher_add(). +

+
+

+

+
++ + + + + + + + + + + + + + +

publisher :

a EpcResource +

key :

the key of the resource to publish, or NULL +

label :

the bookmark's label, or NULL +
+
+
+
+

epc_publisher_get_path ()

+
gchar *             epc_publisher_get_path              (EpcPublisher *publisher,
+                                                         const gchar *key);
+

+Queries the path component of the URI used to publish the resource +associated with key. This is useful when referencing keys in published +resources. Passing NULL as key retrieve the path of the root context. +

+
++ + + + + + + + + + + + + + +

publisher :

a EpcPublisher +

key :

the resource key to inspect, or NULL.

Returns :

The resource path for key.
+
+
+
+

epc_publisher_get_uri ()

+
gchar *             epc_publisher_get_uri               (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         GError **error);
+

+Queries the URI used to publish the resource associated with key. +This is useful when referencing keys in published resources. When +passing NULL the publisher's base URI is returned. +

+

+The function fails if the publisher's host name cannot be retrieved. +In that case NULL is returned and error is set. The error domain is +EPC_AVAHI_ERROR. Possible error codes are those of the +Avahi library. +

+
++ + + + + + + + + + + + + + + + + + +

publisher :

a EpcPublisher +

key :

the resource key to inspect, or NULL +

error :

return location for a GError, or NULL +

Returns :

The fully qualified URI for key, or NULL on error.
+
+
+
+

epc_publisher_has_key ()

+
gboolean            epc_publisher_has_key               (EpcPublisher *publisher,
+                                                         const gchar *key);
+

+Checks if information is published for key. +

+

+This function allows to use the publisher as local key/value store, +which is useful for instance to prevent accidental key collisions. +

+

+See also: epc_publisher_lookup. +

+
++ + + + + + + + + + + + + + +

publisher :

a EcpPublisher +

key :

the key for addressing contents

Returns :

 +TRUE when the publisher has information for key, +and FALSE otherwise.
+
+
+
+

epc_publisher_lookup ()

+
gpointer            epc_publisher_lookup                (EpcPublisher *publisher,
+                                                         const gchar *key);
+

+Looks up the user_data passed to epc_publisher_add_handler() for key. +Returns NULL if the specified key doesn't exist or wasn't published +with epc_publisher_add_handler(). +

+

+This function allows to use the publisher as local key/value store, +which is useful for instance to prevent accidental key collisions. +

+

+See also: epc_publisher_has_key. +

+
++ + + + + + + + + + + + + + +

publisher :

a EcpPublisher +

key :

the key for addressing contents

Returns :

The user_data associated with key, or NULL.
+
+
+
+

epc_publisher_remove ()

+
gboolean            epc_publisher_remove                (EpcPublisher *publisher,
+                                                         const gchar *key);
+

+Removes a key and its associated contents from a EpcPublisher. +

+
++ + + + + + + + + + + + + + +

publisher :

a EpcPublisher +

key :

the key for addressing the contents

Returns :

 +TRUE if the key was found and removed from the EpcPublisher.
+
+
+
+

epc_publisher_list ()

+
GList *             epc_publisher_list                  (EpcPublisher *publisher,
+                                                         const gchar *pattern);
+

+Matches published keys against patterns containing '*' (wildcard) and '?' +(joker). Passing NULL as pattern is equivalent to passing "*" and returns +all published keys. This function is useful for generating dynamic resource +listings in other formats than libepc's specific format. See GPatternSpec +for information about glob-style patterns. +

+

+If the call was successful, a list of keys matching pattern is returned. +If the call was not successful, it returns NULL. +

+

+The returned list should be freed when no longer needed: +

+

+

+
+ g_list_foreach (keys, (GFunc) g_free, NULL);
+ g_list_free (keys);
+
+

+

+

+See also epc_consumer_list() for builtin listing capabilities. +

+
++ + + + + + + + + + + + + + +

publisher :

a EpcPublisher +

pattern :

a glob-style pattern, or NULL +

Returns :

A newly allocated list of keys, or NULL when an error occurred.
+
+
+
+

epc_publisher_run ()

+
gboolean            epc_publisher_run                   (EpcPublisher *publisher,
+                                                         GError **error);
+

+Starts the server component of the EpcPublisher and blocks until it is +shutdown using epc_publisher_quit(). If the server could not be started, the +function returns FALSE and sets error. The error domain is +EPC_AVAHI_ERROR. Possible error codes are those of the +Avahi library. +

+

+When starting the publisher in HTTPS mode for the first time self-signed +keys must be generated. Generating secure keys needs some time, +so it is recommended to call epc_progress_window_install(), or +epc_shell_set_progress_hooks() to provide visual feedback during that +operation. Key generation takes place in a separate background thread and +the calling thread waits in a GMainLoop. Therefore the UI can remain +responsive when generating keys. +

+

+To start the server without blocking call epc_publisher_run_async(). +

+
++ + + + + + + + + + + + + + +

publisher :

a EpcPublisher +

error :

return location for a GError, or NULL +

Returns :

 +TRUE when the publisher was successfully started, +FALSE if an error occurred.
+
+
+
+

epc_publisher_run_async ()

+
gboolean            epc_publisher_run_async             (EpcPublisher *publisher,
+                                                         GError **error);
+

+Starts the server component of the EpcPublisher without blocking. If the +server could not be started then the function returns FALSE and sets error. The +error domain is EPC_AVAHI_ERROR. Possible error codes are those of the +Avahi library. +

+

+To stop the server component call epc_publisher_quit(). +See epc_publisher_run() for additional information. +

+
++ + + + + + + + + + + + + + +

publisher :

a EpcPublisher +

error :

return location for a GError, or NULL +

Returns :

 +TRUE when the publisher was successfully started, +FALSE if an error occurred.
+
+
+
+

epc_publisher_quit ()

+
gboolean            epc_publisher_quit                  (EpcPublisher *publisher);
+

+Stops the server component of the EpcPublisher started with +epc_publisher_run() or epc_publisher_run_async. The functions +returns TRUE when the built-in server was running and had to +be stopped. If the server wasn't running the function returns +FALSE. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

Returns :

 +TRUE when the server had to be stopped, and FALSE otherwise.
+
+
+
+

epc_publisher_expand_name ()

+
gchar *             epc_publisher_expand_name           (const gchar *name,
+                                                         GError **error);
+

+Expands all known placeholders in name. Supported placeholders are: +

+

+

+
    +
  • %a: the program name as returned by g_get_application_name() +
    • +
  • %h: the machine's host name in title case
    • +
  • %u: the user's login name in title case
    • +
  • %U: the user's real name
    • +
  • %%: the percent sign
    • +
+

+

+

+The function fails when the host name cannot looked up. In that case NULL +is returned and error is set. The error domain is EPC_AVAHI_ERROR. +Possible error codes are those of the Avahi library. +

+
++ + + + + + + + + + + + + + +

name :

a service name with placeholders

error :

return location for a GError, or NULL +

Returns :

The name with all known placeholders expanded, or NULL on error.
+
+
+
+

epc_publisher_set_auth_flags ()

+
void                epc_publisher_set_auth_flags        (EpcPublisher *publisher,
+                                                         EpcAuthFlags flags);
+

+Changes the authentication settings the publisher uses +when epc_publisher_set_auth_handler() is used. +See "auth-flags" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

flags :

new authentication settings
+
+
+
+

epc_publisher_set_auth_handler ()

+
void                epc_publisher_set_auth_handler      (EpcPublisher *publisher,
+                                                         const gchar *key,
+                                                         EpcAuthHandler handler,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy_data);
+

+Installs an authentication handler for the specified key. +Passing NULL as key installs a fallback handler for all resources. +

+

+The handler is called on every request matching key. On this call +a temporary EpcAuthContext and user_data are passed to the handler. +The EpcAuthContext references the publisher and key passed here. +When replacing or deleting the resource referenced by key, or when +the publisher is destroyed, the function +described by destroy_data is called with user_data as argument. +

+

+

+
+

Note

+

+ This should be called after adding the resource identified by key, + not before. For instance, after calling epc_publisher_add(). +

+
+

+

+

+See also epc_publisher_set_auth_flags(). +

+
++ + + + + + + + + + + + + + + + + + + + + + +

publisher :

a EpcPublisher +

key :

the key of the resource to protect, or NULL +

handler :

the EpcAuthHandler to connect

user_data :

data to pass on handler calls

destroy_data :

a function for releasing user_data +
+
+
+
+

epc_publisher_set_collision_handling ()

+
void                epc_publisher_set_collision_handling
+                                                        (EpcPublisher *publisher,
+                                                         EpcCollisionHandling method);
+

+Changes the collision handling strategy the publisher uses. +See "collision-handling" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

method :

the new strategy
+

Since 0.3.1

+
+
+
+

epc_publisher_set_contents_path ()

+
void                epc_publisher_set_contents_path     (EpcPublisher *publisher,
+                                                         const gchar *path);
+

+Changes the server path used for publishing contents. +See "contents-path" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

path :

the new contents path
+
+
+
+

epc_publisher_set_credentials ()

+
void                epc_publisher_set_credentials       (EpcPublisher *publisher,
+                                                         const gchar *certfile,
+                                                         const gchar *keyfile);
+

+Changes the file names of the PEM encoded TLS credentials the publisher use +for its services, when the transport "protocol" is +EPC_PROTOCOL_HTTPS. +

+

+See "certificate-file" and +"private-key-file" for details. +

+
++ + + + + + + + + + + + + + +

publisher :

a EpcPublisher +

certfile :

file name of the server certificate

keyfile :

file name of the private key
+
+
+
+

epc_publisher_set_protocol ()

+
void                epc_publisher_set_protocol          (EpcPublisher *publisher,
+                                                         EpcProtocol protocol);
+

+Changes the transport protocol the publisher uses. +See "protocol" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

protocol :

the transport protocol
+
+
+
+

epc_publisher_set_service_cookie ()

+
void                epc_publisher_set_service_cookie    (EpcPublisher *publisher,
+                                                         const gchar *cookie);
+

+Changes the unique identifier of the service. +See "service-cookie" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

cookie :

the new service identifier, or NULL +
+

Since 0.3.1

+
+
+
+

epc_publisher_set_service_name ()

+
void                epc_publisher_set_service_name      (EpcPublisher *publisher,
+                                                         const gchar *name);
+

+Changes the human friendly name this EpcPublisher uses to announce its +service. See "service-name" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

name :

the new name of this EpcPublisher +
+
+
+
+

epc_publisher_get_auth_flags ()

+
EpcAuthFlags        epc_publisher_get_auth_flags        (EpcPublisher *publisher);
+

+Queries the current authentication settings of the publisher. +See "auth-flags" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

Returns :

The authentication settings of the publisher, +or EPC_AUTH_DEFAULT on error.
+
+
+
+

epc_publisher_get_certificate_file ()

+
const gchar *       epc_publisher_get_certificate_file  (EpcPublisher *publisher);
+

+Queries the file name of the PEM encoded server certificate. +See "certificate-file" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

Returns :

The certificate's file name, or NULL.
+
+
+
+

epc_publisher_get_collision_handling ()

+
EpcCollisionHandling epc_publisher_get_collision_handling
+                                                        (EpcPublisher *publisher);
+

+Queries the collision handling strategy the publisher uses. +See "collision-handling" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

Returns :

The publisher's collision handling strategy, +or EPC_COLLISIONS_IGNORE on error.
+

Since 0.3.1

+
+
+
+

epc_publisher_get_contents_path ()

+
const gchar *       epc_publisher_get_contents_path     (EpcPublisher *publisher);
+

+Queries the server path used for publishing contents. +See "contents-path" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

Returns :

The server's contents path.
+
+
+
+

epc_publisher_get_private_key_file ()

+
const gchar *       epc_publisher_get_private_key_file  (EpcPublisher *publisher);
+

+Queries the file name of the PEM encoded private server key. +See "private-key-file" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

Returns :

The private key's file name, or NULL.
+
+
+
+

epc_publisher_get_protocol ()

+
EpcProtocol         epc_publisher_get_protocol          (EpcPublisher *publisher);
+

+Queries the transport protocol the publisher uses. +See "protocol" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

Returns :

The transport protocol the publisher uses, +or EPC_PROTOCOL_UNKNOWN on error.
+
+
+
+

epc_publisher_get_service_cookie ()

+
const gchar *       epc_publisher_get_service_cookie    (EpcPublisher *publisher);
+

+Queries the unique identifier of the service. +See "service-cookie" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

Returns :

The unique identifier of the service, or NULL on error.
+

Since 0.3.1

+
+
+
+

epc_publisher_get_service_domain ()

+
const gchar *       epc_publisher_get_service_domain    (EpcPublisher *publisher);
+

+Queries the DNS domain for which this EpcPublisher announces its service. +See "domain" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

Returns :

The DNS-SD domain of this EpcPublisher, or NULL.
+
+
+
+

epc_publisher_get_service_name ()

+
const gchar *       epc_publisher_get_service_name      (EpcPublisher *publisher);
+

+Queries the human friendly name this EpcPublisher uses +to announce its service. See "name" for details. +

+
++ + + + + + + + + + +

publisher :

a EpcPublisher +

Returns :

The human friendly name of this EpcPublisher.
+
+
+
+

Property Details

+
+

The "application" property

+
  "application"              gchar*                : Read / Write / Construct
+

Program name for deriving the service type.

+

Default value: NULL

+
+
+
+

The "auth-flags" property

+
  "auth-flags"               EpcAuthFlags          : Read / Write / Construct
+

The authentication settings to use.

+
+
+
+

The "certificate-file" property

+
  "certificate-file"         gchar*                : Read / Write / Construct
+

File name for the PEM encoded server certificate.

+

Default value: NULL

+
+
+
+

The "collision-handling" property

+
  "collision-handling"       EpcCollisionHandling  : Read / Write / Construct
+

+The collision handling strategy the publisher uses. +

+

Default value: EPC_COLLISIONS_CHANGE_NAME

+

Since 0.3.1

+
+
+
+

The "contents-path" property

+
  "contents-path"            gchar*                : Read / Write / Construct
+

The built-in server path for publishing resources.

+

Default value: "/contents"

+
+
+
+

The "private-key-file" property

+
  "private-key-file"         gchar*                : Read / Write / Construct
+

File name for the PEM encoded private server key.

+

Default value: NULL

+
+
+
+

The "protocol" property

+
  "protocol"                 EpcProtocol           : Read / Write / Construct
+

The transport protocol the publisher uses.

+

Default value: EPC_PROTOCOL_HTTPS

+
+
+
+

The "service-cookie" property

+
  "service-cookie"           gchar*                : Read / Write / Construct
+

+Unique identifier of the service. This cookie is used for implementing +EPC_COLLISIONS_UNIQUE_SERVICE, and usually is a UUID or the MD5/SHA1/... +checksum of a central document. When passing NULL, but using the +EPC_COLLISIONS_UNIQUE_SERVICE strategy a time based UUID is +generated and used as service identifier. +

+

Default value: NULL

+

Since 0.3.1

+
+
+
+

The "service-domain" property

+
  "service-domain"           gchar*                : Read / Write / Construct
+

Internet domain for publishing the service.

+

Default value: NULL

+
+
+
+

The "service-name" property

+
  "service-name"             gchar*                : Read / Write / Construct
+

User friendly name for the service.

+

Default value: NULL

+
+
+
+

See Also

+EpcConsumer, EpcAuthContext, EpcContentsHandler +
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-service-monitor.html libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-service-monitor.html --- libepc-0.3.11/docs/reference/libepc/html/libepc-1.0-service-monitor.html 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/libepc-1.0-service-monitor.html 2011-10-13 14:52:15.000000000 +0000 @@ -0,0 +1,478 @@ + + + + +EpcServiceMonitor + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

EpcServiceMonitor

+

EpcServiceMonitor — find DNS-SD services

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <libepc/service-monitor.h>
+
+struct              EpcServiceMonitorClass;
+                    EpcServiceMonitorPrivate;
+struct              EpcServiceMonitor;
+EpcServiceMonitor * epc_service_monitor_new             (const gchar *application,
+                                                         const gchar *domain,
+                                                         EpcProtocol first_protocol,
+                                                         ...);
+EpcServiceMonitor * epc_service_monitor_new_for_types   (const gchar *domain,
+                                                         ...);
+EpcServiceMonitor * epc_service_monitor_new_for_types_strv
+                                                        (const gchar *domain,
+                                                         gchar **types);
+void                epc_service_monitor_set_skip_our_own
+                                                        (EpcServiceMonitor *monitor,
+                                                         gboolean setting);
+gboolean            epc_service_monitor_get_skip_our_own
+                                                        (EpcServiceMonitor *monitor);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----EpcServiceMonitor
+
+
+
+

Properties

+
+  "application"              gchar*                : Read / Write / Construct Only
+  "domain"                   gchar*                : Read / Write / Construct Only
+  "service-types"            GStrv                 : Read / Write / Construct Only
+  "skip-our-own"             gboolean              : Read / Write / Construct
+
+
+
+

Signals

+
+  "scanning-done"                                  : Run First
+  "service-found"                                  : Run First
+  "service-removed"                                : Run First
+
+
+
+

Description

+

+The EpcServiceMonitor object provides an easy method for finding DNS-SD +services. It hides all the boring state and callback handling Avahi +requires, and just exposes three simple GObject signals: +"service-found", "service-removed" +and "scanning-done". +

+

+

+
+

Example 8. Find an Easy-Publish service

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
monitor = epc_service_monitor_new ("glom", NULL, EPC_PROTOCOL_UNKNOWN);
+
+g_signal_connect (monitor, "service-found", service_found_cb, self);
+g_signal_connect (monitor, "service-removed", service_removed_cb, self);
+
+g_main_loop_run (loop);
+
+ +
+


+

+
+
+

Details

+
+

struct EpcServiceMonitorClass

+
struct EpcServiceMonitorClass {
+  void (*service_found)   (EpcServiceMonitor  *monitor,
+                           const gchar        *name,
+                           EpcServiceInfo     *info);
+  void (*service_removed) (EpcServiceMonitor  *monitor,
+                           const gchar        *name,
+                           const gchar        *type);
+  void (*scanning_done)   (EpcServiceMonitor  *monitor,
+                           const gchar        *type);
+};
+
+

+Virtual methods of the EpcServiceMonitor class. +

+
++ + + + + + + + + + + + + + +

service_found ()

virtual method of the "service-found" signal

service_removed ()

virtual method of the "service-removed" signal

scanning_done ()

virtual method of the "scanning-done" signal
+
+
+
+

EpcServiceMonitorPrivate

+
typedef struct _EpcServiceMonitorPrivate EpcServiceMonitorPrivate;
+

+Private fields of the EpcServiceMonitor class. +

+
+
+
+

struct EpcServiceMonitor

+
struct EpcServiceMonitor;
+

+Public fields of the EpcServiceMonitor class. +

+
+
+
+

epc_service_monitor_new ()

+
EpcServiceMonitor * epc_service_monitor_new             (const gchar *application,
+                                                         const gchar *domain,
+                                                         EpcProtocol first_protocol,
+                                                         ...);
+

+Creates a new service monitor watching the specified domain for a +certain application using one of the protocols listed. Passing NULL for +application lists all libepc based applications. Passing NULL for domain +monitors the local network. Passing an empty protocol list requests +monitoring of all service-types supported by the library (see +epc_service_type_list_supported()). +

+
++ + + + + + + + + + + + + + + + + + + + + + +

application :

name of the application to monitor, or NULL +

domain :

the DNS domain to monitor, or NULL +

first_protocol :

the first protocol to monitor

... :

a list of additional protocols, terminated by EPC_PROTOCOL_UNKNOWN +

Returns :

The newly created service monitor.
+
+
+
+

epc_service_monitor_new_for_types ()

+
EpcServiceMonitor * epc_service_monitor_new_for_types   (const gchar *domain,
+                                                         ...);
+

+Creates a new service monitor watching the specified domain for the +service-types listed. Passing NULL for domain monitors the local network. +Passing an empty service list requests monitoring of all service-types +supported by the library (see epc_service_type_list_supported()). +

+

+See also: epc_service_monitor_new_for_types_strv() +

+
++ + + + + + + + + + + + + + +

domain :

the DNS domain to monitor, or NULL +

... :

a NULL terminated list of service types to monitor

Returns :

The newly created service monitor.
+

Since 0.3.1

+
+
+
+

epc_service_monitor_new_for_types_strv ()

+
EpcServiceMonitor * epc_service_monitor_new_for_types_strv
+                                                        (const gchar *domain,
+                                                         gchar **types);
+

+Creates a new service monitor watching the specified domain for the +service-types listed. Passing NULL for domain monitors the local network. +Passing an empty service list requests monitoring of all service-types +supported by the library (see epc_service_type_list_supported()). +

+

+See also: epc_service_monitor_new_for_types() +

+
++ + + + + + + + + + + + + + +

domain :

the DNS domain to monitor, or NULL +

types :

a NULL terminated list of service types to monitor

Returns :

The newly created service monitor.
+
+
+
+

epc_service_monitor_set_skip_our_own ()

+
void                epc_service_monitor_set_skip_our_own
+                                                        (EpcServiceMonitor *monitor,
+                                                         gboolean setting);
+

+Updates the "skip-our-own" property. +

+
++ + + + + + + + + + +

monitor :

a EpcServiceMonitor +

setting :

the new setting
+
+
+
+

epc_service_monitor_get_skip_our_own ()

+
gboolean            epc_service_monitor_get_skip_our_own
+                                                        (EpcServiceMonitor *monitor);
+

+Queries the current value of the "skip-our-own" property. +

+
++ + + + + + + + + + +

monitor :

a EpcServiceMonitor +

Returns :

The current value of the "skip-our-own" property
+
+
+
+

Property Details

+
+

The "application" property

+
  "application"              gchar*                : Read / Write / Construct Only
+

The application to monitor.

+

Default value: NULL

+
+
+
+

The "domain" property

+
  "domain"                   gchar*                : Read / Write / Construct Only
+

The DNS domain to monitor.

+

Default value: NULL

+
+
+
+

The "service-types" property

+
  "service-types"            GStrv                 : Read / Write / Construct Only
+

The DNS-SD services types to watch.

+
+
+
+

The "skip-our-own" property

+
  "skip-our-own"             gboolean              : Read / Write / Construct
+

Skip services of the current application.

+

Default value: FALSE

+
+
+
+

Signal Details

+
+

The "scanning-done" signal

+
void                user_function                      (EpcServiceMonitor *monitor,
+                                                        gchar             *type,
+                                                        gpointer           user_data)      : Run First
+

+This signal is emitted when active scanning as finished and most certainly +no new services will be detected for some time. Can be used for instance +to hide an progress indicator. +

+
++ + + + + + + + + + + + + + +

monitor :

a EpcServiceMonitor +

type :

the service type watched

user_data :

user data set when the signal handler was connected.
+
+
+
+

The "service-found" signal

+
void                user_function                      (EpcServiceMonitor *monitor,
+                                                        gchar             *name,
+                                                        EpcServiceInfo    *info,
+                                                        gpointer           user_data)      : Run First
+

+This signal is emitted when a new service was found. +

+
++ + + + + + + + + + + + + + + + + + +

monitor :

a EpcServiceMonitor +

name :

name of the service removed

info :

a description of the service found

user_data :

user data set when the signal handler was connected.
+
+
+
+

The "service-removed" signal

+
void                user_function                      (EpcServiceMonitor *monitor,
+                                                        gchar             *name,
+                                                        gchar             *type,
+                                                        gpointer           user_data)      : Run First
+

+This signal is emitted when a previously known service disappears. +

+
++ + + + + + + + + + + + + + + + + + +

monitor :

a EpcServiceMonitor +

name :

name of the service removed

type :

the service type watched

user_data :

user data set when the signal handler was connected.
+
+
+
+
+
+ Generated by GTK-Doc V1.18.1
+ + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/publishing.html libepc-0.4.2/docs/reference/libepc/html/publishing.html --- libepc-0.3.11/docs/reference/libepc/html/publishing.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/publishing.html 2011-10-13 14:52:15.000000000 +0000 @@ -6,36 +6,31 @@ - - - + + + - - - - - - + - + -
+

Publishing

-EpcAuthContext — manage authentication +EpcAuthContext — manage authentication
-EpcContents — custom contents +EpcContents — custom contents
-EpcPublisher — easily publish values +EpcPublisher — easily publish values

@@ -46,6 +41,6 @@

- Generated by GTK-Doc V1.11
+ Generated by GTK-Doc V1.18.1
- + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/html/style.css libepc-0.4.2/docs/reference/libepc/html/style.css --- libepc-0.3.11/docs/reference/libepc/html/style.css 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/style.css 2011-10-13 14:52:15.000000000 +0000 @@ -1,13 +1,15 @@ .synopsis, .classsynopsis { - background: #eeeeee; - border: solid 1px #aaaaaa; + /* tango:aluminium 1/2 */ + background: #eeeeec; + border: solid 1px #d3d7cf; padding: 0.5em; } .programlisting { - background: #eeeeff; - border: solid 1px #aaaaff; + /* tango:sky blue 0/1 */ + background: #e6f3ff; + border: solid 1px #729fcf; padding: 0.5em; } .variablelist @@ -20,64 +22,64 @@ vertical-align: top; } -/* this is needed so that the local anchors are displayed below the naviagtion */ @media screen { sup a.footnote { position: relative; top: 0em ! important; + } - div.refnamediv a[name], div.refsect1 a[name] + /* this is needed so that the local anchors are displayed below the naviagtion */ + div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] { + display: inline-block; position: relative; - top: -4.5em; + top:-5em; } + /* this seems to be a bug in the xsl style sheets when generating indexes */ + div.index div.index + { + top: 0em; + } + /* make space for the fixed navigation bar and add space at the bottom so that + * link targets appear somewhat close to top + */ + body + { + padding-top: 3.2em; + padding-bottom: 20em; + } + /* style and size the navigation bar */ table.navigation#top { - background: #ffeeee; - border: solid 1px #ffaaaa; + position: fixed; + /* tango:scarlet red 0/1 */ + background: #ffe6e6; + border: solid 1px #ef2929; margin-top: 0; margin-bottom: 0; - position: fixed; top: 0; left: 0; - height: 2em; - z-index: 1; + height: 3em; + z-index: 10; } - .navigation a + .navigation a, .navigation a:visited { - color: #770000; + /* tango:scarlet red 3 */ + color: #a40000; } - .navigation a:visited + .navigation a:hover { - color: #550000; + /* tango:scarlet red 1 */ + color: #ef2929; } td.shortcuts { - color: #770000; + /* tango:scarlet red 1 */ + color: #ef2929; font-size: 80%; white-space: nowrap; } - div.refentry, div.chapter, div.reference, div.part, div.book, div.glossary, div.sect1, div.appendix, div.preface - { - position: relative; - top: 3em; - z-index: 0; - } - div.glossary, div.index - { - position: relative; - top: 2em; - z-index: 0; - } - div.refnamediv - { - margin-top: 2em; - } - body - { - padding-bottom: 20em; - } } @media print { table.navigation { @@ -87,13 +89,14 @@ div.titlepage table.navigation { visibility: visible; display: table; - background: #ffeeee; - border: solid 1px #ffaaaa; + /* tango:scarlet red 0/1 */ + background: #ffe6e6; + border: solid 1px #ef2929; margin-top: 0; margin-bottom: 0; top: 0; left: 0; - height: 2em; + height: 3em; } } @@ -102,7 +105,6 @@ font-size: 200%; } - div.gallery-float { float: left; @@ -116,44 +118,48 @@ { clear: both; } -a + +a, a:visited { text-decoration: none; + /* tango:sky blue 2 */ + color: #3465a4; } a:hover { text-decoration: underline; - color: #FF0000; + /* tango:sky blue 1 */ + color: #729fcf; } div.table table { border-collapse: collapse; border-spacing: 0px; - border-style: solid; - border-color: #777777; - border-width: 1px; + /* tango:aluminium 3 */ + border: solid 1px #babdb6; } div.table table td, div.table table th { - border-style: solid; - border-color: #777777; - border-width: 1px; + /* tango:aluminium 3 */ + border: solid 1px #babdb6; padding: 3px; vertical-align: top; } div.table table th { - background-color: #eeeeee; + /* tango:aluminium 2 */ + background-color: #d3d7cf; } hr { - color: #777777; - background: #777777; - border: 0; + /* tango:aluminium 3 */ + color: #babdb6; + background: #babdb6; + border: none 0px; height: 1px; clear: both; } @@ -161,7 +167,100 @@ .footer { padding-top: 3.5em; - color: #777777; + /* tango:aluminium 3 */ + color: #babdb6; text-align: center; font-size: 80%; } + +.warning +{ + /* tango:orange 0/1 */ + background: #ffeed9; + border-color: #ffb04f; +} +.note +{ + /* tango:chameleon 0/0.5 */ + background: #d8ffb2; + border-color: #abf562; +} +.note, .warning +{ + padding: 0.5em; + border-width: 1px; + border-style: solid; +} +.note h3, .warning h3 +{ + margin-top: 0.0em +} +.note p, .warning p +{ + margin-bottom: 0.0em +} + +/* blob links */ +h2 .extralinks, h3 .extralinks +{ + float: right; + /* tango:aluminium 3 */ + color: #babdb6; + font-size: 80%; + font-weight: normal; +} + +.annotation +{ + /* tango:aluminium 5 */ + color: #555753; + font-size: 80%; + font-weight: normal; +} + +/* code listings */ + +.listing_code .programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */ +.listing_code .programlisting .comment { color: #a1a39d; } /* tango: aluminium 4 */ +.listing_code .programlisting .function { color: #000000; font-weight: bold; } +.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */ +.listing_code .programlisting .keyword { color: #4e9a06; } /* tango: chameleon 3 */ +.listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */ +.listing_code .programlisting .normal { color: #000000; } +.listing_code .programlisting .number { color: #75507b; } /* tango: plum 2 */ +.listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */ +.listing_code .programlisting .string { color: #c17d11; } /* tango: chocolate 2 */ +.listing_code .programlisting .type { color: #000000; } +.listing_code .programlisting .type a { color: #11326b; } /* tango: sky blue 4 */ +.listing_code .programlisting .symbol { color: #ce5c00; } /* tango: orange 3 */ + +.listing_frame { + /* tango:sky blue 1 */ + border: solid 1px #729fcf; + padding: 0px; +} + +.listing_lines, .listing_code { + margin-top: 0px; + margin-bottom: 0px; + padding: 0.5em; +} +.listing_lines { + /* tango:sky blue 0.5 */ + background: #a6c5e3; + /* tango:aluminium 6 */ + color: #2e3436; +} +.listing_code { + /* tango:sky blue 0 */ + background: #e6f3ff; +} +.listing_code .programlisting { + /* override from previous */ + border: none 0px; + padding: 0px; +} +.listing_lines pre, .listing_code pre { + margin: 0px; +} + diff -Nru libepc-0.3.11/docs/reference/libepc/html/widgets.html libepc-0.4.2/docs/reference/libepc/html/widgets.html --- libepc-0.3.11/docs/reference/libepc/html/widgets.html 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/html/widgets.html 2011-10-13 14:52:15.000000000 +0000 @@ -6,33 +6,28 @@ - - - + + + - - - - - - + - + -
+

Widgets

-EpcPasswordDialog — common password dialog +EpcPasswordDialog — common password dialog
-EpcProgressWindow — provide feedback during lengthly operations +EpcProgressWindow — provide feedback during lengthly operations

@@ -44,6 +39,6 @@

- Generated by GTK-Doc V1.11
+ Generated by GTK-Doc V1.18.1
- + \ No newline at end of file diff -Nru libepc-0.3.11/docs/reference/libepc/libepc-1.0.types libepc-0.4.2/docs/reference/libepc/libepc-1.0.types --- libepc-0.3.11/docs/reference/libepc/libepc-1.0.types 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/libepc-1.0.types 2011-10-13 14:52:15.000000000 +0000 @@ -1,11 +1,11 @@ -epc_publisher_get_type -epc_service_info_get_type -epc_collision_handling_get_type -epc_protocol_get_type -epc_auth_flags_get_type epc_address_family_get_type -epc_service_monitor_get_type +epc_auth_flags_get_type +epc_collision_handling_get_type epc_consumer_get_type epc_dispatcher_get_type -epc_progress_window_get_type epc_password_dialog_get_type +epc_progress_window_get_type +epc_protocol_get_type +epc_publisher_get_type +epc_service_info_get_type +epc_service_monitor_get_type diff -Nru libepc-0.3.11/docs/reference/libepc/Makefile.in libepc-0.4.2/docs/reference/libepc/Makefile.in --- libepc-0.3.11/docs/reference/libepc/Makefile.in 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/Makefile.in 2011-10-13 14:52:15.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.3 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, @@ -22,8 +22,9 @@ #################################### VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -52,6 +53,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/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) @@ -78,6 +80,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -93,6 +96,10 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -101,29 +108,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ @@ -140,6 +128,7 @@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -156,9 +145,12 @@ 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@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -176,6 +168,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -208,7 +201,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -297,11 +289,11 @@ $(top_builddir)/libepc-ui/libepc-ui-1.0.la \ $(top_builddir)/libepc/libepc-1.0.la -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute # We set GPATH here; this gives us semantics for GNU make @@ -311,15 +303,21 @@ # GPATH = $(srcdir) TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +SETUP_FILES = \ + $(content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + # This includes the standard gtk-doc make rules, copied by gtkdocize. # Other files to distribute # e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) +DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + tmpl.stamp sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -334,6 +332,10 @@ $(DOC_MODULE)-unused.txt CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp all: all-am .SUFFIXES: @@ -346,9 +348,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/libepc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/reference/libepc/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/libepc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/reference/libepc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -366,6 +368,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -395,13 +398,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); 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 @@ -433,6 +440,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" @@ -521,55 +529,90 @@ uninstall-local -@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp +@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @ENABLE_GTK_DOC_FALSE@all-local: -docs: html-build.stamp +docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) $(REPORT_FILES): sgml-build.stamp +#### setup #### + +setup-build.stamp: + -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + echo ' DOC Preparing build'; \ + files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + test -f $(abs_srcdir)/$$file && \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + done; \ + fi; \ + test -d $(abs_srcdir)/tmpl && \ + { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + chmod -R u+w $(abs_builddir)/tmpl; } \ + fi + @touch setup-build.stamp + #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + @echo ' DOC Scanning header files' + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + echo " DOC Introspecting gobjects"; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ + test -f $$i || touch $$i ; \ done \ fi - touch scan-build.stamp + @touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true #### templates #### -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - touch tmpl-build.stamp +tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo ' DOC Rebuilding template files' + @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + if test -w $(abs_srcdir) ; then \ + cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ + fi \ + fi + @touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true -tmpl/*.sgml: +$(srcdir)/tmpl/*.sgml: @true #### xml #### -sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' +sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo ' DOC Building XML' @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - touch sgml-build.stamp + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + @touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true @@ -577,39 +620,79 @@ #### html #### html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - mkhtml_options=""; \ + @echo ' DOC Building HTML' + @rm -rf html + @mkdir html + @mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ - fi - cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ + fi; \ + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ + if test -f $(abs_srcdir)/$$file ; then \ + cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + fi; \ + if test -f $(abs_builddir)/$$file ; then \ + cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + fi; \ + done; + @echo ' DOC Fixing cross-references' + @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + @touch html-build.stamp + +#### pdf #### + +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo ' DOC Building PDF' + @rm -f $(DOC_MODULE).pdf + @mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ + if test "x$(HTML_IMAGES)" != "x"; then \ + for img in $(HTML_IMAGES); do \ + part=`dirname $$img`; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ + if test $$? != 0; then \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ + fi; \ + done; \ + fi; \ + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + @touch pdf-build.stamp ############## clean-local: - rm -f *~ *.bak - rm -rf .libs + @rm -f *~ *.bak + @rm -rf .libs distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + rm -rf tmpl; \ + fi maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html + @rm -rf xml html install-data-local: - installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ else \ if test -n "$(DOC_MODULE_VERSION)"; then \ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ @@ -618,21 +701,18 @@ fi; \ $(mkinstalldirs) $${installdir} ; \ for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ + echo ' $(INSTALL_DATA) '$$i ; \ $(INSTALL_DATA) $$i $${installdir}; \ done; \ if test -n "$(DOC_MODULE_VERSION)"; then \ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ - mv -f $${installdir}/$(DOC_MODULE).devhelp \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ fi; \ - ! which gtkdoc-rebase >/dev/null 2>&1 || \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ + $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ fi uninstall-local: - if test -n "$(DOC_MODULE_VERSION)"; then \ + @if test -n "$(DOC_MODULE_VERSION)"; then \ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ else \ installdir="$(DESTDIR)$(TARGET_DIR)"; \ @@ -648,22 +728,21 @@ @ENABLE_GTK_DOC_FALSE@ @false dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - ! which gtkdoc-rebase >/dev/null 2>&1 || \ - gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + @mkdir $(distdir)/tmpl + @mkdir $(distdir)/html + @-cp ./tmpl/*.sgml $(distdir)/tmpl + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs sgml.stamp: $(DOC_MODULE)-sections.txt $(DOC_MAIN_SGML_FILE): sgml.stamp + # 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 libepc-0.3.11/docs/reference/libepc/tmpl/auth-context.sgml libepc-0.4.2/docs/reference/libepc/tmpl/auth-context.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/auth-context.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/auth-context.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + @@ -86,6 +89,7 @@ +@void: @Returns: diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/consumer.sgml libepc-0.4.2/docs/reference/libepc/tmpl/consumer.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/consumer.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/consumer.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/contents.sgml libepc-0.4.2/docs/reference/libepc/tmpl/contents.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/contents.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/contents.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/dispatcher.sgml libepc-0.4.2/docs/reference/libepc/tmpl/dispatcher.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/dispatcher.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/dispatcher.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + @@ -108,7 +111,7 @@ @domain: @host: @port: -@Varargs: +@...: @@ -155,7 +158,7 @@ @dispatcher: @type: -@Varargs: +@...: @@ -190,6 +193,7 @@ +@void: @Returns: @@ -207,6 +211,7 @@ +@void: @Returns: diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/password-dialog.sgml libepc-0.4.2/docs/reference/libepc/tmpl/password-dialog.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/password-dialog.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/password-dialog.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + @@ -71,7 +74,7 @@ @parent: @realm: @first_button_text: -@Varargs: +@...: @Returns: diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/progress-window.sgml libepc-0.4.2/docs/reference/libepc/tmpl/progress-window.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/progress-window.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/progress-window.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/protocol.sgml libepc-0.4.2/docs/reference/libepc/tmpl/protocol.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/protocol.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/protocol.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + @@ -73,6 +76,7 @@ +@void: @Returns: diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/publisher.sgml libepc-0.4.2/docs/reference/libepc/tmpl/publisher.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/publisher.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/publisher.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/service-info.sgml libepc-0.4.2/docs/reference/libepc/tmpl/service-info.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/service-info.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/service-info.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/service-monitor.sgml libepc-0.4.2/docs/reference/libepc/tmpl/service-monitor.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/service-monitor.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/service-monitor.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + @@ -94,7 +97,7 @@ @application: @domain: @first_protocol: -@Varargs: +@...: @Returns: @@ -104,7 +107,7 @@ @domain: -@Varargs: +@...: @Returns: diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/service-type.sgml libepc-0.4.2/docs/reference/libepc/tmpl/service-type.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/service-type.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/service-type.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/shell.sgml libepc-0.4.2/docs/reference/libepc/tmpl/shell.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/shell.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/shell.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + @@ -32,6 +35,7 @@ +@void: @Returns: @@ -58,6 +62,7 @@ +@void: diff -Nru libepc-0.3.11/docs/reference/libepc/tmpl/tls.sgml libepc-0.4.2/docs/reference/libepc/tmpl/tls.sgml --- libepc-0.3.11/docs/reference/libepc/tmpl/tls.sgml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/tmpl/tls.sgml 2011-10-13 14:52:15.000000000 +0000 @@ -19,6 +19,9 @@ + + + diff -Nru libepc-0.3.11/docs/reference/libepc/xml/api-index-0.3.1.xml libepc-0.4.2/docs/reference/libepc/xml/api-index-0.3.1.xml --- libepc-0.3.11/docs/reference/libepc/xml/api-index-0.3.1.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/api-index-0.3.1.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ - - - - -E -EpcPublisher:collision-handling -EpcPublisher:service-cookie -epc_dispatcher_get_collision_handling -epc_dispatcher_get_cookie -epc_dispatcher_set_collision_handling -epc_dispatcher_set_cookie -epc_publisher_get_collision_handling -epc_publisher_get_service_cookie -epc_publisher_set_collision_handling -epc_publisher_set_service_cookie -epc_service_monitor_new_for_types - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/api-index-deprecated.xml libepc-0.4.2/docs/reference/libepc/xml/api-index-deprecated.xml --- libepc-0.3.11/docs/reference/libepc/xml/api-index-deprecated.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/api-index-deprecated.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ - - - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/api-index-full.xml libepc-0.4.2/docs/reference/libepc/xml/api-index-full.xml --- libepc-0.3.11/docs/reference/libepc/xml/api-index-full.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/api-index-full.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,222 +0,0 @@ - - - - -E -EpcAddressFamily -EpcAuthContext -EpcAuthFlags -EpcAuthHandler -EpcCollisionHandling -EpcConsumer -EpcConsumer::authenticate -EpcConsumer::publisher-resolved -EpcConsumer:application -EpcConsumer:domain -EpcConsumer:hostname -EpcConsumer:name -EpcConsumer:password -EpcConsumer:path -EpcConsumer:port -EpcConsumer:protocol -EpcConsumer:username -EpcConsumerClass -EpcConsumerPrivate -EpcContents -EpcContentsHandler -EpcContentsReadFunc -EpcDispatcher -EpcDispatcher:collision-handling -EpcDispatcher:cookie -EpcDispatcher:name -EpcDispatcherClass -EpcDispatcherPrivate -EpcPasswordDialog -EpcPasswordDialog:anonymous -EpcPasswordDialog:anonymous-allowed -EpcPasswordDialog:password -EpcPasswordDialog:realm -EpcPasswordDialog:username -EpcPasswordDialogClass -EpcPasswordDialogPrivate -EpcProgressWindow -EpcProgressWindow:message -EpcProgressWindow:progress -EpcProgressWindow:title -EpcProgressWindowClass -EpcProgressWindowPrivate -EpcProtocol -EpcPublisher -EpcPublisher:application -EpcPublisher:auth-flags -EpcPublisher:certificate-file -EpcPublisher:collision-handling -EpcPublisher:contents-path -EpcPublisher:private-key-file -EpcPublisher:protocol -EpcPublisher:service-cookie -EpcPublisher:service-domain -EpcPublisher:service-name -EpcPublisherClass -EpcPublisherPrivate -EpcServiceInfo -EpcServiceMonitor -EpcServiceMonitor::scanning-done -EpcServiceMonitor::service-found -EpcServiceMonitor::service-removed -EpcServiceMonitor:application -EpcServiceMonitor:domain -EpcServiceMonitor:service-types -EpcServiceMonitor:skip-our-own -EpcServiceMonitorClass -EpcServiceMonitorPrivate -EpcShellProgressHooks -epc_address_family_get_class -epc_address_family_to_string -epc_auth_context_check_password -epc_auth_context_get_key -epc_auth_context_get_password -epc_auth_context_get_publisher -epc_auth_flags_get_class -epc_auth_flags_to_string -EPC_AVAHI_ERROR -epc_collision_handling_get_class -epc_collision_handling_to_string -epc_consumer_get_password -epc_consumer_get_protocol -epc_consumer_get_username -epc_consumer_is_publisher_resolved -epc_consumer_list -epc_consumer_lookup -epc_consumer_new -epc_consumer_new_for_name -epc_consumer_new_for_name_full -epc_consumer_resolve_publisher -epc_consumer_set_password -epc_consumer_set_protocol -epc_consumer_set_username -epc_contents_get_data -epc_contents_get_mime_type -epc_contents_is_stream -epc_contents_new -epc_contents_new_dup -epc_contents_ref -epc_contents_stream_new -epc_contents_stream_read -epc_contents_unref -EPC_DEBUG_LEVEL -epc_dispatcher_add_service -epc_dispatcher_add_service_subtype -epc_dispatcher_get_collision_handling -epc_dispatcher_get_cookie -epc_dispatcher_get_name -epc_dispatcher_new -epc_dispatcher_reset -epc_dispatcher_run -epc_dispatcher_set_collision_handling -epc_dispatcher_set_cookie -epc_dispatcher_set_name -epc_dispatcher_set_service_details -EPC_HTTP_ERROR -epc_password_dialog_attach -epc_password_dialog_get_anonymous_allowed -epc_password_dialog_get_password -epc_password_dialog_get_realm -epc_password_dialog_get_username -epc_password_dialog_is_anonymous -epc_password_dialog_new -epc_password_dialog_set_anonymous -epc_password_dialog_set_anonymous_allowed -epc_password_dialog_set_password -epc_password_dialog_set_realm -epc_password_dialog_set_username -epc_progress_window_install -epc_progress_window_new -epc_progress_window_update -epc_protocol_build_uri -epc_protocol_from_name -epc_protocol_get_class -epc_protocol_get_service_type -epc_protocol_get_uri_scheme -epc_protocol_to_string -epc_publisher_add -epc_publisher_add_bookmark -epc_publisher_add_file -epc_publisher_add_handler -epc_publisher_expand_name -epc_publisher_get_auth_flags -epc_publisher_get_certificate_file -epc_publisher_get_collision_handling -epc_publisher_get_contents_path -epc_publisher_get_path -epc_publisher_get_private_key_file -epc_publisher_get_protocol -epc_publisher_get_service_cookie -epc_publisher_get_service_domain -epc_publisher_get_service_name -epc_publisher_get_uri -epc_publisher_has_key -epc_publisher_list -epc_publisher_lookup -epc_publisher_new -epc_publisher_quit -epc_publisher_remove -epc_publisher_run -epc_publisher_run_async -epc_publisher_set_auth_flags -epc_publisher_set_auth_handler -epc_publisher_set_collision_handling -epc_publisher_set_contents_path -epc_publisher_set_credentials -epc_publisher_set_protocol -epc_publisher_set_service_cookie -epc_publisher_set_service_name -epc_service_info_get_address -epc_service_info_get_address_family -epc_service_info_get_detail -epc_service_info_get_host -epc_service_info_get_interface -epc_service_info_get_port -epc_service_info_get_service_type -epc_service_info_new -epc_service_info_new_full -epc_service_info_ref -epc_service_info_unref -epc_service_monitor_get_skip_our_own -epc_service_monitor_new -epc_service_monitor_new_for_types -epc_service_monitor_new_for_types_strv -epc_service_monitor_set_skip_our_own -epc_service_type_get_base -epc_service_type_get_protocol -EPC_SERVICE_TYPE_HTTP -EPC_SERVICE_TYPE_HTTPS -epc_service_type_list_supported -epc_service_type_new -epc_shell_create_avahi_entry_group -epc_shell_create_service_browser -epc_shell_get_debug_level -epc_shell_get_host_name -epc_shell_progress_begin -epc_shell_progress_end -epc_shell_progress_update -epc_shell_restart_avahi_client -epc_shell_set_progress_hooks -epc_shell_watch_avahi_client_state -epc_shell_watch_remove -epc_tls_certificate_load -epc_tls_certificate_new -epc_tls_certificate_save -EPC_TLS_ERROR -epc_tls_get_certificate_filename -epc_tls_get_private_key_filename -epc_tls_get_server_credentials -epc_tls_private_key_load -epc_tls_private_key_new -epc_tls_private_key_save -EPC_TLS_SECONDS_PER_DAY -EPC_TLS_SECONDS_PER_HOUR -EPC_TLS_SECONDS_PER_MINUTE - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/auth-context.xml libepc-0.4.2/docs/reference/libepc/xml/auth-context.xml --- libepc-0.3.11/docs/reference/libepc/xml/auth-context.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/auth-context.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,281 +0,0 @@ - - - - - -EpcAuthContext -3 -LIBEPC-1.0 Library - - - -EpcAuthContext -manage authentication - - -Stability Level -Unstable, unless otherwise indicated - - - -Synopsis - - - -#include <libepc/publish.h> - -enum EpcAuthFlags; -gboolean (*EpcAuthHandler) (EpcAuthContext *context, - const gchar *username, - gpointer user_data); - EpcAuthContext; -gboolean epc_auth_context_check_password (const EpcAuthContext *context, - const gchar *password); -const gchar* epc_auth_context_get_key (const EpcAuthContext *context); -const gchar* epc_auth_context_get_password (const EpcAuthContext *context); -EpcPublisher* epc_auth_context_get_publisher (const EpcAuthContext *context); - -GFlagsClass* epc_auth_flags_get_class (void); -const gchar* epc_auth_flags_to_string (EpcAuthFlags value); - - - - - - - - - - - - -Description - -With each request the EpcPublisher verifies access authorization by calling -the EpcAuthHandler registered for the key in question, if any. Information about -that process is stored in the EpcAuthContext structure. - - -To register an authentication handler call epc_publisher_set_auth_handler(): - - - - Register an authentication handler - - epc_publisher_set_auth_handler (publisher, "sensitive-key", - my_auth_handler, my_object); - - - - -To verify that the user password provided password matches -the expected one use epc_auth_context_check_password(): - - - - Verify a password - - static gboolean - my_auth_handler (EpcAuthContext *context, - const gchar *username, - gpointer user_data) - { - MyObject *self = user_data; - const gchar *expected_password; - const gchar *requested_key; - - requested_key = epc_auth_context_get_key (context); - expected_password = lookup_password (self, requested_key); - - return epc_auth_context_check_password (context, expected_password); - } - - - - - - - -Details - -enum EpcAuthFlags -EpcAuthFlagstypedef enum /* <flags> */ -{ - EPC_AUTH_DEFAULT = 0, - EPC_AUTH_PASSWORD_TEXT_NEEDED = (1 << 0) -} EpcAuthFlags; - - -These flags specify the authentication behaviour of an EpcPublisher. - - - -EPC_AUTH_DEFAULT - The default authentication settings. - - - -EPC_AUTH_PASSWORD_TEXT_NEEDED - Set this flag when your EpcAuthFlags -needs the supplied password in plain text - for instance to pass it to a -database server used by your application. This flag replaces the secure Digest -authentication scheme with the insecure Basic authentication scheme. -Therefore this setting is valid only when the publisher's transport -protocol is EPC_PROTOCOL_HTTPS (secure http). - - - - -EpcAuthHandler () -EpcAuthHandlergboolean (*EpcAuthHandler) (EpcAuthContext *context, - const gchar *username, - gpointer user_data); - -Functions implementing this callback shall return TRUE when the -credentials provided by the authentication request grant access -to the resource described by context. - - -The username is NULL when no creditials were passed, and anonymous access -is tried. - - -See also epc_publisher_set_auth_flags. When EPC_AUTH_DEFAULT is used, -you should call epc_auth_context_check_password -to verify that the password passed in the request matches the known password -for that user. In this case there is no way to retrieve the password from -the EpcAuthContext because the network protocol transfers just a hash code, -not the actual password. - - -However, when EPC_AUTH_PASSWORD_TEXT_NEEDED is used, you should call -epc_auth_context_get_password() and then do your own authentication check. -For instance, you might need to delegate the authentication to some other -code or server, such as a database server. - - -context : - the EpcAuthContext - -username : - the username provided for authentication, or NULL - -user_data : - user data set when the signal handler was installed - -Returns : TRUE when access is granted, and FALSE otherwise. - - - -EpcAuthContext -EpcAuthContexttypedef struct _EpcAuthContext EpcAuthContext; - -This data structure describes a pending authentication request -which shall be verified by an EpcAuthHandler installed by -epc_publisher_set_auth_handler(). - - - - There is no way to retrieve the password from the EpcAuthContext, as - the network protocol transfers just a hash code, not the actual password. - - - - -epc_auth_context_check_password () -epc_auth_context_check_passwordgboolean epc_auth_context_check_password (const EpcAuthContext *context, - const gchar *password); - -Verifies that the password supplied with the network request matches -the password the application expects. There is no way to retrieve the -password from the EpcAuthContext, as the network protocol transfers -just a hash code, not the actual password. - - -context : - a EpcAuthContext - -password : - the expected password - -Returns : TRUE when the sent password matches, or FALSE otherwise. - - - -epc_auth_context_get_key () -epc_auth_context_get_keyconst gchar* epc_auth_context_get_key (const EpcAuthContext *context); - -Queries the resource key associated with the authentication context. - - -context : - a EpcAuthContext - -Returns : The resource key. - - - -epc_auth_context_get_password () -epc_auth_context_get_passwordconst gchar* epc_auth_context_get_password (const EpcAuthContext *context); - -Queries the password sent for the authentication context when Basic -authentication was allowed for the context, and NULL otherwise. - - -See also: EPC_AUTH_PASSWORD_TEXT_NEEDED - - -context : - a EpcAuthContext - -Returns : The password sent, or NULL. - - - -epc_auth_context_get_publisher () -epc_auth_context_get_publisherEpcPublisher* epc_auth_context_get_publisher (const EpcAuthContext *context); - -Queries the EpcPublisher owning the authentication context. - - -context : - a EpcAuthContext - -Returns : The owning EpcPublisher. - - - -epc_auth_flags_get_class () -epc_auth_flags_get_classGFlagsClass* epc_auth_flags_get_class (void); - -Retrieves the GFlagsClass describing the EpcAuthFlags flags. - - -Returns : The GFlagsClass describing EpcAuthFlags. - - - -epc_auth_flags_to_string () -epc_auth_flags_to_stringconst gchar* epc_auth_flags_to_string (EpcAuthFlags value); - -Retrieves the name of a EpcAuthFlags value, or NULL when value is invalid. - - -value : - a EpcAuthFlags value - -Returns : The string representation of value, or NULL. - - - - - - - - -See Also -#EpcPublisher - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/consumer.xml libepc-0.4.2/docs/reference/libepc/xml/consumer.xml --- libepc-0.3.11/docs/reference/libepc/xml/consumer.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/consumer.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,638 +0,0 @@ - - - - - -EpcConsumer -3 -LIBEPC-1.0 Library - - - -EpcConsumer -lookup published values - - -Stability Level -Unstable, unless otherwise indicated - - - -Synopsis - - - -#include <libepc/consumer.h> - -#define EPC_HTTP_ERROR - EpcConsumerPrivate; - EpcConsumerClass; - EpcConsumer; - -EpcConsumer* epc_consumer_new (const EpcServiceInfo *service); -EpcConsumer* epc_consumer_new_for_name (const gchar *name); -EpcConsumer* epc_consumer_new_for_name_full (const gchar *name, - const gchar *application, - const gchar *domain); - -EpcProtocol epc_consumer_get_protocol (EpcConsumer *consumer); -const gchar* epc_consumer_get_password (EpcConsumer *consumer); -const gchar* epc_consumer_get_username (EpcConsumer *consumer); - -void epc_consumer_set_protocol (EpcConsumer *consumer, - EpcProtocol protocol); -void epc_consumer_set_password (EpcConsumer *consumer, - const gchar *password); -void epc_consumer_set_username (EpcConsumer *consumer, - const gchar *username); - -gboolean epc_consumer_resolve_publisher (EpcConsumer *consumer, - guint timeout); -gboolean epc_consumer_is_publisher_resolved (EpcConsumer *consumer); -gpointer epc_consumer_lookup (EpcConsumer *consumer, - const gchar *key, - gsize *length, - GError **error); -GList* epc_consumer_list (EpcConsumer *consumer, - const gchar *pattern, - GError **error); - - - - -Object Hierarchy - - GObject - +----EpcConsumer - - - - - - - - -Properties - - "application" gchar* : Read / Write / Construct Only - "domain" gchar* : Read / Write / Construct Only - "hostname" gchar* : Read / Write / Construct Only - "name" gchar* : Read / Write / Construct Only - "password" gchar* : Read / Write / Construct - "path" gchar* : Read / Write / Construct Only - "port" gint : Read / Write / Construct Only - "protocol" EpcProtocol : Read / Write / Construct - "username" gchar* : Read / Write / Construct - - - - -Signals - - "authenticate" : Run Last - "publisher-resolved" : Run First - - - - - -Description - -The EpcConsumer object is used to lookup values published by an -EpcPublisher service. Currently HTTP is used for communication. -To find a publisher, use DNS-SD (also known as ZeroConf) to -list EPC_PUBLISHER_SERVICE_TYPE services. - - - - Lookup a value - - service_name = choose_recently_used_service (); - - if (service_name) - consumer = epc_consumer_new_for_name (service_name); - else - consumer = epc_consumer_new (your_app_find_service ()); - - value = epc_consumer_lookup (consumer, "glom-settings", NULL, &error); - g_object_unref (consumer); - - your_app_consume_value (value); - g_free (value); - - - - - - Find a publisher - - dialog = aui_service_dialog_new ("Choose a Service", main_window, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, - NULL); - - aui_service_dialog_set_browse_service_types (AUI_SERVICE_DIALOG (dialog), - EPC_SERVICE_TYPE_HTTPS, - EPC_SERVICE_TYPE_HTTP, - NULL); - - aui_service_dialog_set_service_type_name (AUI_SERVICE_DIALOG (dialog), - EPC_SERVICE_TYPE_HTTPS, - "Secure Transport"); - aui_service_dialog_set_service_type_name (AUI_SERVICE_DIALOG (dialog), - EPC_SERVICE_TYPE_HTTP, - "Insecure Transport"); - - if (GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog))) - { - EpcServiceInfo *service = - epc_service_info_new (aui_service_dialog_get_service_type (AUI_SERVICE_DIALOG (dialog)), - aui_service_dialog_get_host_name (AUI_SERVICE_DIALOG (dialog)), - aui_service_dialog_get_port (AUI_SERVICE_DIALOG (dialog)), - aui_service_dialog_get_txt_data (AUI_SERVICE_DIALOG (dialog))); - - consumer = epc_consumer_new (service); - epc_service_info_unref (service); - ... - } - - - - - - - -Details - -EPC_HTTP_ERROR -EPC_HTTP_ERROR#define EPC_HTTP_ERROR (epc_http_error_quark()) - - -Error domain for HTTP operations. Errors in this domain will -be from the SoupKnownStatusCode enumeration. See GError for -information on error domains. - - - -EpcConsumerPrivate -EpcConsumerPrivatetypedef struct _EpcConsumerPrivate EpcConsumerPrivate; - -Private fields of the EpcConsumer class. - - - -EpcConsumerClass -EpcConsumerClasstypedef struct { - void (*authenticate) (EpcConsumer *consumer, - const gchar *realm); - - void (*publisher_resolved) (EpcConsumer *consumer, - EpcProtocol protocol, - const gchar *hostname, - guint port); -} EpcConsumerClass; - - -Virtual methods of the EpcConsumer class. - - - -authenticate () - virtual method of the "authenticate" signal - - - -publisher_resolved () - virtual method of the "publisher-resolved" signal - - - - -EpcConsumer -EpcConsumertypedef struct _EpcConsumer EpcConsumer; - -Public fields of the EpcConsumer class. - - - -epc_consumer_new () -epc_consumer_newEpcConsumer* epc_consumer_new (const EpcServiceInfo *service); - -Creates a new EpcConsumer object and associates it with a known -EpcPublisher. The service description can be retrieved, for instance, -by using EpcServiceMonitor, or by using the service selection dialog -of avahi-ui (AuiServiceDialog). - - -The connection is not established until functions like epc_consumer_lookup(), -epc_consumer_list() or epc_consumer_resolve_publisher are called. - - -service : - the publisher's service description - -Returns : The newly created EpcConsumer object - - - -epc_consumer_new_for_name () -epc_consumer_new_for_nameEpcConsumer* epc_consumer_new_for_name (const gchar *name); - -Creates a new EpcConsumer object and associates it with the EpcPublisher -announcing itself with name on the local network. The DNS-SD service name -used for searching the EpcPublisher is derived from the application's -program name as returned by g_get_prgname(). - - -See epc_consumer_new_for_name_full() for additional notes -and a method allowing better control over the search process. - - -name : - the service name of an EpcPublisher - -Returns : The newly created EpcConsumer object - - - -epc_consumer_new_for_name_full () -epc_consumer_new_for_name_fullEpcConsumer* epc_consumer_new_for_name_full (const gchar *name, - const gchar *application, - const gchar *domain); - -Creates a new EpcConsumer object and associates it with the EpcPublisher -announcing itself with name on domain. The DNS-SD service of the -EpcPublisher is derived from application using epc_service_type_new(). - - - - This function shall be used to re-connect to a formerly used EpcPublisher, - selected for instance from a list for recently used services. Therefore - using epc_consumer_new_for_name_full() is a quite optimistic approach for - contacting a publisher: You call it without really knowing if the - publisher you requested really exists. You only know that it existed - in the past when you added it to your list of recently used publishers, - but you do not know if it still exists. - - - To let your users choose from an up-to-date service list, you have to - use a dynamic service list as provided by avahi-ui for choosing a service - and pass the information this widget provides (hostname, port, protocol) - to epc_consumer_new(). - - - - - The connection is not established until a function retrieving - data, like for instance epc_consumer_lookup(), is called. - - - Explicitly call epc_consumer_resolve_publisher() or connect to - the "publisher-resolved" signal, when your application - needs reliable information about the existance of the EpcPublisher - described by name. - - - -name : - the service name of an EpcPublisher - -application : - the publisher's program name - -domain : - the DNS domain of the EpcPublisher - -Returns : The newly created EpcConsumer object - - - -epc_consumer_get_protocol () -epc_consumer_get_protocolEpcProtocol epc_consumer_get_protocol (EpcConsumer *consumer); - -Queries the transport protocol to use for contacting the publisher. -See "protocol" for details. - - -consumer : - a EpcConsumer - -Returns : The transport protocol this consumer uses. - - - -epc_consumer_get_password () -epc_consumer_get_passwordconst gchar* epc_consumer_get_password (EpcConsumer *consumer); - -Queries the password used for authentication. -See "password" for details. - - -consumer : - a EpcConsumer - -Returns : The password this consumer uses. - - - -epc_consumer_get_username () -epc_consumer_get_usernameconst gchar* epc_consumer_get_username (EpcConsumer *consumer); - -Queries the user name used for authentication. -See "username" for details. - - -consumer : - a EpcConsumer - -Returns : The user name this consumer uses. - - - -epc_consumer_set_protocol () -epc_consumer_set_protocolvoid epc_consumer_set_protocol (EpcConsumer *consumer, - EpcProtocol protocol); - -Changes the transport protocol to use for contacting the publisher. -See "protocol" for details. - - -consumer : - a EpcConsumer - -protocol : - the new transport protocol - - - -epc_consumer_set_password () -epc_consumer_set_passwordvoid epc_consumer_set_password (EpcConsumer *consumer, - const gchar *password); - -Changes the password used for authentication. -See "password" for details. - - -consumer : - a EpcConsumer - -password : - the new password, or NULL - - - -epc_consumer_set_username () -epc_consumer_set_usernamevoid epc_consumer_set_username (EpcConsumer *consumer, - const gchar *username); - -Changes the user name used for authentication. -See "username" for details. - - -consumer : - a EpcConsumer - -username : - the new user name, or NULL - - - -epc_consumer_resolve_publisher () -epc_consumer_resolve_publishergboolean epc_consumer_resolve_publisher (EpcConsumer *consumer, - guint timeout); - -Waits until the consumer has found its EpcPublisher. -A timeout of 0 requests infinite waiting. - - -See also: "publisher-resolved" - - -consumer : - a EpcConsumer - -timeout : - the amount of milliseconds to wait - -Returns : TRUE when a publisher has been found, FALSE otherwise. - - - -epc_consumer_is_publisher_resolved () -epc_consumer_is_publisher_resolvedgboolean epc_consumer_is_publisher_resolved (EpcConsumer *consumer); - -Checks if the host name of this consumer's EpcPublisher -has been resolved already. - - -See also: epc_consumer_resolve_publisher(), "publisher-resolved" - - -consumer : - a EpcConsumer - -Returns : TRUE when the host name has been resolved, and FALSE otherwise. - - - -epc_consumer_lookup () -epc_consumer_lookupgpointer epc_consumer_lookup (EpcConsumer *consumer, - const gchar *key, - gsize *length, - GError **error); - -If the call was successful, this returns a newly allocated buffer containing -the value the publisher provides for key. If the call was not -successful it returns NULL and sets error. The error domain is -EPC_HTTP_ERROR. Error codes are taken from the SoupKnownStatusCode -enumeration. - - -For instance, the error code will be SOUP_STATUS_FORBIDDEN if -authentication failed (see epc_publisher_set_auth_handler()). You must -include libsoup/soup-status.h -to use this error code. - - -The returned buffer should be freed when no longer needed. - - -See the description of EpcPublisher for discussion of NULL values. - - -consumer : - the consumer - -key : - unique key of the value - -length : - location to store length in bytes of the contents, or NULL - -error : - return location for a GError, or NULL - -Returns : A copy of the publisher's value for the the requested key, -or NULL when an error occurred. - - - -epc_consumer_list () -epc_consumer_listGList* epc_consumer_list (EpcConsumer *consumer, - const gchar *pattern, - GError **error); - -Matches published keys against patterns containing '*' (wildcard) and '?' -(joker). Passing NULL as pattern is equivalent to passing "*" and returns -all published keys. This function is useful to find and select dynamically -published values. See GPatternSpec for information about glob-style -patterns. - - -If the call was successful, a list of keys matching pattern is returned. -If the call was not successful, it returns NULL and sets error. -The error domain is EPC_HTTP_ERROR. Error codes are taken from the -SoupKnownStatusCode enumeration. - - -The returned list should be freed when no longer needed: - - - - g_list_foreach (keys, (GFunc) g_free, NULL); - g_list_free (keys); - - - -See also epc_publisher_list() for creating custom listings. - - -consumer : - a EpcConsumer - -pattern : - a glob-style pattern, or NULL - -error : - return location for a GError, or NULL - -Returns : A newly allocated list of keys, or NULL when an error occurred. - - - - - -Property Details -The <literal>"application"</literal> property -EpcConsumer:application "application" gchar* : Read / Write / Construct Only -Program name the publisher to use.Default value: NULL - -The <literal>"domain"</literal> property -EpcConsumer:domain "domain" gchar* : Read / Write / Construct Only -DNS domain of the publisher to use.Default value: NULL - -The <literal>"hostname"</literal> property -EpcConsumer:hostname "hostname" gchar* : Read / Write / Construct Only -Host name of the publisher to use.Default value: NULL - -The <literal>"name"</literal> property -EpcConsumer:name "name" gchar* : Read / Write / Construct Only -Service name of the publisher to use.Default value: NULL - -The <literal>"password"</literal> property -EpcConsumer:password "password" gchar* : Read / Write / Construct -The password to use for authentication.Default value: NULL - -The <literal>"path"</literal> property -EpcConsumer:path "path" gchar* : Read / Write / Construct Only -The path the publisher uses for contents.Default value: "/contents" - -The <literal>"port"</literal> property -EpcConsumer:port "port" gint : Read / Write / Construct Only -TCP/IP port of the publisher to use.Allowed values: [0,65535] -Default value: 0 - -The <literal>"protocol"</literal> property -EpcConsumer:protocol "protocol" EpcProtocol : Read / Write / Construct -The transport protocol to use for contacting the publisher.Default value: EPC_PROTOCOL_UNKNOWN - -The <literal>"username"</literal> property -EpcConsumer:username "username" gchar* : Read / Write / Construct -The user name to use for authentication.Default value: NULL - - - - -Signal Details -The <literal>"authenticate"</literal> signal -EpcConsumer::authenticategboolean user_function (EpcConsumer *consumer, - gchar *realm, - gpointer user_data) : Run Last - -Emitted when the EpcConsumer requires authentication. The signal -handler should provide these credentials, which may come from the -user or from cached information by setting the "username" -and "password" properties. When providing credentials -the signal handler should return TRUE to stop signal emission. - - -If the provided credentials fail then the signal will be emmitted again. - - -consumer : - the EpcConsumer emitting the signal - -realm : - the realm being authenticated to - -user_data : -user data set when the signal handler was connected. -Returns : TRUE when the signal handler handled the authentication request, -and FALSE otherwise. - -The <literal>"publisher-resolved"</literal> signal -EpcConsumer::publisher-resolvedvoid user_function (EpcConsumer *consumer, - EpcProtocol protocol, - gchar *hostname, - guint port, - gpointer user_data) : Run First - -This signal is emitted when a EpcConsumer created with -epc_consumer_new_for_name() or epc_consumer_new_for_name_full -has found its EpcPublisher. - - -Publisher detection is integrated with the GLib main loop. Therefore the -signal will not be emitted before a main loop is run (g_main_loop_run(), -gtk_main()). So to reliably consume this signal connect to it directly -after creating the EpcConsumer. - - -See also: epc_consumer_resolve_publisher(), epc_consumer_is_pulisher_resolved - - -consumer : - the EpcConsumer emitting the signal - -protocol : - the publisher's transport protocol - -hostname : - the publisher's host name - -port : - the publisher's TCP/IP port - -user_data : -user data set when the signal handler was connected. - - - - - -See Also -#EpcPublisher - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/contents.xml libepc-0.4.2/docs/reference/libepc/xml/contents.xml --- libepc-0.3.11/docs/reference/libepc/xml/contents.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/contents.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,351 +0,0 @@ - - - - - -EpcContents -3 -LIBEPC-1.0 Library - - - -EpcContents -custom contents - - -Stability Level -Unstable, unless otherwise indicated - - - -Synopsis - - - -#include <libepc/contents.h> - -gboolean (*EpcContentsReadFunc) (EpcContents *contents, - gpointer buffer, - gsize *length, - gpointer user_data); - EpcContents; -EpcContents* epc_contents_new (const gchar *type, - gpointer data, - gssize length, - GDestroyNotify destroy_data); -EpcContents* epc_contents_new_dup (const gchar *type, - gconstpointer data, - gssize length); -EpcContents* epc_contents_ref (EpcContents *contents); -void epc_contents_unref (EpcContents *contents); - -gconstpointer epc_contents_get_data (EpcContents *contents, - gsize *length); -const gchar* epc_contents_get_mime_type (EpcContents *contents); - -EpcContents* epc_contents_stream_new (const gchar *type, - EpcContentsReadFunc callback, - gpointer user_data, - GDestroyNotify destroy_data); -gconstpointer epc_contents_stream_read (EpcContents *contents, - gsize *length); -gboolean epc_contents_is_stream (EpcContents *contents); - - - - - - - - - - - - -Description - -EpcContents is a reference counted structure for storing custom contents. -To publish custom content call epc_publisher_add_handler() to register a -EpcContentsHandler like this: - - - - A custom contents handler - - static EpcContents* - timestamp_handler (EpcPublisher *publisher G_GNUC_UNUSED, - const gchar *key G_GNUC_UNUSED, - gpointer data) - { - time_t now = time (NULL); - struct tm *tm = localtime (&now); - const gchar *format = data; - gsize length = 60; - gchar *buffer; - - buffer = g_malloc (length); - length = strftime (buffer, length, format, tm); - - return epc_content_new ("text/plain", buffer, length); - } - - - - - - - -Details - -EpcContentsReadFunc () -EpcContentsReadFuncgboolean (*EpcContentsReadFunc) (EpcContents *contents, - gpointer buffer, - gsize *length, - gpointer user_data); - -This callback is used to retrieve the next chunk of data for a streaming -contents buffer created with epc_contents_stream_read. - - -Return FALSE when the buffer has reached its end, and no more data is -available. Also return FALSE, when the buffer size passed in length is -not sufficient. Copy your minimal buffer size to length in that situation. - - -The library might pass NULL for buffer on the first call to start buffer -size negotation. - - -See also: epc_contents_stream_new, epc_contents_stream_read - - -contents : - a EpcContents buffer - -buffer : - a location for storing the contents, or NULL - -length : - a location for passing and storing the contents length in bytes. - -user_data : - the user_data passed to epc_contents_stream_new - -Returns : Returns TRUE when the next chunk could be read, and FALSE on error. - - - -EpcContents -EpcContentstypedef struct _EpcContents EpcContents; - -A reference counted buffer for storing contents to deliver by the -EpcPublisher. Use epc_contents_new() or epc_contents_new_dup to create -instances of this buffer. - - - -epc_contents_new () -epc_contents_newEpcContents* epc_contents_new (const gchar *type, - gpointer data, - gssize length, - GDestroyNotify destroy_data); - -Creates a new EpcContents buffer, and takes ownership of the data passed. -Passing NULL for type is equivalent to passing "application/octet-stream". - - -See also: epc_contents_new_dup, epc_contents_stream_new - - -type : - the MIME type of this contents, or NULL - -data : - static contents for the buffer - -length : - the contents length in bytes, or -1 if data is a null-terminated string. - -destroy_data : - This function will be called to free data when it is no longer needed. - -Returns : The newly created EpcContents buffer. - - - -epc_contents_new_dup () -epc_contents_new_dupEpcContents* epc_contents_new_dup (const gchar *type, - gconstpointer data, - gssize length); - -Creates a new EpcContents buffer, and copies the data passed. -Passing NULL for type is equivalent to passing "application/octet-stream". - - -See also: epc_contents_new, epc_contents_stream_new - - -type : - the MIME type of this contents, or NULL - -data : - static contents for the buffer - -length : - the content's length in bytes, or -1 if data is a null-terminated string. - -Returns : The newly created EpcContents buffer. - - - -epc_contents_ref () -epc_contents_refEpcContents* epc_contents_ref (EpcContents *contents); - -Increases the reference count of contents. - - -contents : - a EpcContents buffer - -Returns : the same contents buffer. - - - -epc_contents_unref () -epc_contents_unrefvoid epc_contents_unref (EpcContents *contents); - -Decreases the reference count of contents. -When its reference count drops to 0, the buffer is released -(i.e. its memory is freed). - - -contents : - a EpcContents buffer - - - -epc_contents_get_data () -epc_contents_get_datagconstpointer epc_contents_get_data (EpcContents *contents, - gsize *length); - -Retrieves the contents of a static contents buffer created with -epc_contents_new(). Any other buffer returns NULL. The data returned -is owned by the EpcContents buffer and must not be freeded. - - -See also: epc_contents_stream_read(). - - -contents : - a EpcContents buffer - -length : - a location for storing the contents length - -Returns : Returns the static buffer contents, or NULL. This should not be freed or modified. - - - -epc_contents_get_mime_type () -epc_contents_get_mime_typeconst gchar* epc_contents_get_mime_type (EpcContents *contents); - -Queries the MIME type associated with the buffer. Returns the MIME -type specified for epc_contents_new() or epc_contents_stream_new, -or "application/octet-stream" when NULL was passed. - - -contents : - a EpcContents buffer - -Returns : Returns the MIME type of the buffer. - - - -epc_contents_stream_new () -epc_contents_stream_newEpcContents* epc_contents_stream_new (const gchar *type, - EpcContentsReadFunc callback, - gpointer user_data, - GDestroyNotify destroy_data); - -Creates a new EpcContents buffer for large contents like movie files, -which cannot, or should be delivered as solid blob of data. - - -Passing NULL for type is equivalent to passing "application/octet-stream". - - -See also: epc_contents_stream_read(), epc_contents_is_stream - - -type : - the MIME type of this contents, or NULL - -callback : - the function for retrieving chunks - -user_data : - data which will be passed to callback - -destroy_data : - This function will be called to free user_data when it is no longer needed. - -Returns : The newly created EpcContents buffer. - - - -epc_contents_stream_read () -epc_contents_stream_readgconstpointer epc_contents_stream_read (EpcContents *contents, - gsize *length); - -Retrieves the next chunk of data for a streaming contents buffer created -with epc_contents_stream_read(). NULL is returned, when the buffer has -reached its end, or isn't a streaming contents buffer. - - -The data returned is owned by the EpcContents buffer and must not be -freeded by the called. Make sure to copy the returned data before the -function again, as repeated calls to the function might return the -same buffer, but filled with new data. - - -See also: epc_contents_stream_new(), epc_contents_is_stream - - -contents : - a EpcContents buffer - -length : - a location for storing the contents length - -Returns : Returns the next chunk of data, or NULL. The should not be freed or modified. - - - -epc_contents_is_stream () -epc_contents_is_streamgboolean epc_contents_is_stream (EpcContents *contents); - -Checks if stream routines can be used for retreiving -the contents of the buffer. - - -See also: epc_contents_stream_new(), epc_contents_stream_read - - -contents : - a EpcContents buffer - -Returns : Returns TRUE when stream routines have to be used. - - - - - - - - -See Also -#EpcPublisher - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/dispatcher.xml libepc-0.4.2/docs/reference/libepc/xml/dispatcher.xml --- libepc-0.3.11/docs/reference/libepc/xml/dispatcher.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/dispatcher.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,534 +0,0 @@ - - - - - -EpcDispatcher -3 -LIBEPC-1.0 Library - - - -EpcDispatcher -publish DNS-SD services - - -Stability Level -Unstable, unless otherwise indicated - - - -Synopsis - - - -#include <libepc/dispatcher.h> - -enum EpcAddressFamily; -enum EpcCollisionHandling; - EpcDispatcherPrivate; - EpcDispatcherClass; - EpcDispatcher; -EpcDispatcher* epc_dispatcher_new (const gchar *name); -gboolean epc_dispatcher_run (EpcDispatcher *dispatcher, - GError **error); -void epc_dispatcher_reset (EpcDispatcher *dispatcher); -void epc_dispatcher_add_service (EpcDispatcher *dispatcher, - EpcAddressFamily protocol, - const gchar *type, - const gchar *domain, - const gchar *host, - guint16 port, - ...); -void epc_dispatcher_add_service_subtype (EpcDispatcher *dispatcher, - const gchar *type, - const gchar *subtype); - -void epc_dispatcher_set_collision_handling - (EpcDispatcher *dispatcher, - EpcCollisionHandling method); -void epc_dispatcher_set_cookie (EpcDispatcher *dispatcher, - const gchar *cookie); -void epc_dispatcher_set_name (EpcDispatcher *dispatcher, - const gchar *name); -void epc_dispatcher_set_service_details (EpcDispatcher *dispatcher, - const gchar *type, - ...); - -EpcCollisionHandling epc_dispatcher_get_collision_handling - (EpcDispatcher *dispatcher); -const gchar* epc_dispatcher_get_cookie (EpcDispatcher *dispatcher); -const gchar* epc_dispatcher_get_name (EpcDispatcher *dispatcher); - -GEnumClass* epc_address_family_get_class (void); -const gchar* epc_address_family_to_string (EpcAddressFamily value); -GEnumClass* epc_collision_handling_get_class (void); -const gchar* epc_collision_handling_to_string (EpcCollisionHandling value); - - - - -Object Hierarchy - - GObject - +----EpcDispatcher - - - - - - - - -Properties - - "collision-handling" EpcCollisionHandling : Read / Write / Construct - "cookie" gchar* : Read / Write / Construct - "name" gchar* : Read / Write / Construct - - - - - - -Description - -The EpcDispatcher object provides an easy method for publishing -DNS-SD services. Unlike established APIs like Avahi or HOWL the -EpcDispatcher doesn't expose any state changes reported by the -DNS-SD daemon, but instead tries to handle them automatically. Such state -changes include, for instance, name collisions or a restart of -the DNS-SD daemon. - - - - Publish a printing service - - dispatcher = epc_dispatcher_new ("Dead Tree Desecrator"); - - epc_dispatcher_add_service (dispatcher, EPC_ADDRESS_IPV4, "_ipp._tcp", - NULL, NULL, 651, "path=/printers", NULL); - epc_dispatcher_add_service (dispatcher, EPC_ADDRESS_UNSPEC, - "_duplex._sub._printer._tcp", - NULL, NULL, 515, NULL); - - - - - - - -Details - -enum EpcAddressFamily -EpcAddressFamilytypedef enum -{ - EPC_ADDRESS_UNSPEC = AF_UNSPEC, - EPC_ADDRESS_IPV4 = AF_INET, - EPC_ADDRESS_IPV6 = AF_INET6 -} -EpcAddressFamily; - - -The address family to use for contacting network services. - - - -EPC_ADDRESS_UNSPEC - No preferences exist. Use all address families supported. - - - -EPC_ADDRESS_IPV4 - Exclusively use IPv4 for addressing network services. - - - -EPC_ADDRESS_IPV6 - Exclusively use IPv6 for addressing network services. - - - - -enum EpcCollisionHandling -EpcCollisionHandlingtypedef enum -{ - EPC_COLLISIONS_IGNORE, - EPC_COLLISIONS_CHANGE_NAME, - EPC_COLLISIONS_UNIQUE_SERVICE -} -EpcCollisionHandling; - - -Various strategies for handling service name collisions. - - - -EPC_COLLISIONS_IGNORE - Don't handle collisions at all, just fail silently. - - - -EPC_COLLISIONS_CHANGE_NAME - Try to announce the service with another name. - - - -EPC_COLLISIONS_UNIQUE_SERVICE - Defer own service announcement until the other service. -disappears. - - - - -EpcDispatcherPrivate -EpcDispatcherPrivatetypedef struct _EpcDispatcherPrivate EpcDispatcherPrivate; - -Private fields of the EpcDispatcher class. - - - - -EpcDispatcherClass -EpcDispatcherClasstypedef struct { -} EpcDispatcherClass; - - -Virtual methods of the EpcDispatcher class. - - - -EpcDispatcher -EpcDispatchertypedef struct _EpcDispatcher EpcDispatcher; - -Public fields of the EpcDispatcher class. - - - -epc_dispatcher_new () -epc_dispatcher_newEpcDispatcher* epc_dispatcher_new (const gchar *name); - -Creates a new EpcDispatcher object for announcing a DNS-SD service. -The service is announced on all network interfaces. - - -Call epc_dispatcher_add_service() to actually announce a service. - - -name : - the human friendly name of the service - -Returns : the newly created EpcDispatcher object. - - - -epc_dispatcher_run () -epc_dispatcher_rungboolean epc_dispatcher_run (EpcDispatcher *dispatcher, - GError **error); - -Starts the Avahi client of the EpcDispatcher. If the -client was not started, the function returns FALSE and sets error. The -error domain is EPC_AVAHI_ERROR. Possible error codes are those of the -Avahi library. - - -dispatcher : - a EpcDispatcher - -error : - return location for a GError, or NULL - -Returns : TRUE when the dispatcher was started successfully, -FALSE if an error occurred. - - - -epc_dispatcher_reset () -epc_dispatcher_resetvoid epc_dispatcher_reset (EpcDispatcher *dispatcher); - -Revokes all service announcements of this EpcDispatcher. - - -dispatcher : - a EpcDispatcher - - - -epc_dispatcher_add_service () -epc_dispatcher_add_servicevoid epc_dispatcher_add_service (EpcDispatcher *dispatcher, - EpcAddressFamily protocol, - const gchar *type, - const gchar *domain, - const gchar *host, - guint16 port, - ...); - -Announces a TCP/IP service via DNS-SD. - - -The service type shall be a well-known DNS-SD service type as listed on -. This function tries -to announce both the base service type and the sub service type when the -service name contains more than just one dot: Passing "_anon._sub._ftp._tcp" -for @type will announce the services "_ftp._tcp" and "_anon._sub._ftp._tcp". - - -The function can be called more than once. Is this necessary when the server -provides different access methods. For instance a web server could provide -HTTP and encrypted HTTPS services at the same time. Calling this function -multiple times also is useful for servers providing the same service at -different, but not all network interfaces of the host. - - -When passing %NULL for @domain, the service is announced within the local -network only, otherwise it is announced at the specified DNS domain. The -responsible server must be -configured to support DNS-SD. - - -Pass NULL for host to use the official host name of the machine to announce -the service. On machines with multiple DNS entries you might want to explictly -choose a fully qualified DNS name to announce the service. - - -dispatcher : - a EpcDispatcher - -protocol : - the EpcAddressFamily this service supports - -type : - the machine friendly name of the service - -domain : - the DNS domain for the announcement, or NULL - -host : - the fully qualified host name of the service, or NULL - -port : - the TCP/IP port of the service - -... : - an optional list of TXT records, terminated by NULL - - - -epc_dispatcher_add_service_subtype () -epc_dispatcher_add_service_subtypevoid epc_dispatcher_add_service_subtype (EpcDispatcher *dispatcher, - const gchar *type, - const gchar *subtype); - -Announces an additional sub service for a registered DNS-SD service. - - - -This function will fail silently, when the service specified by -type hasn't been registered yet. - - - -dispatcher : - a EpcDispatcher - -type : - the base service type - -subtype : - the sub service type - - - -epc_dispatcher_set_collision_handling () -epc_dispatcher_set_collision_handlingvoid epc_dispatcher_set_collision_handling - (EpcDispatcher *dispatcher, - EpcCollisionHandling method); - -Changes the collision handling strategy the dispatcher uses. -See "collision-handling" for details. - - -dispatcher : - a EpcDispatcher - -method : - the new strategy - -Since 0.3.1 - -epc_dispatcher_set_cookie () -epc_dispatcher_set_cookievoid epc_dispatcher_set_cookie (EpcDispatcher *dispatcher, - const gchar *cookie); - -Changes the unique identifier of the service. -See "cookie" for details. - - -dispatcher : - a EpcDispatcher - -cookie : - the new service identifier, or NULL - -Since 0.3.1 - -epc_dispatcher_set_name () -epc_dispatcher_set_namevoid epc_dispatcher_set_name (EpcDispatcher *dispatcher, - const gchar *name); - -Changes the user friendly name used for announcing services. -See "name". - - -dispatcher : - a EpcDispatcher - -name : - the new user friendly name - - - -epc_dispatcher_set_service_details () -epc_dispatcher_set_service_detailsvoid epc_dispatcher_set_service_details (EpcDispatcher *dispatcher, - const gchar *type, - ...); - -Updates the list of TXT records for a registered DNS-SD service. -The TXT records are specified by the service type and usually -have the form of key-value pairs: - - - - path=/dwarf-blog/ - - - - -This function will fail silently, when the service specified by -type hasn't been registered yet. - - - -dispatcher : - a EpcDispatcher - -type : - the service type - -... : - a list of TXT records, terminated by NULL - - - -epc_dispatcher_get_collision_handling () -epc_dispatcher_get_collision_handlingEpcCollisionHandling epc_dispatcher_get_collision_handling - (EpcDispatcher *dispatcher); - -Queries the collision handling strategy the dispatcher uses. -See "collision-handling" for details. - - -dispatcher : - a EpcDispatcher - -Returns : The dispatcher's collision handling strategy, -or EPC_COLLISIONS_IGNORE on error. - -Since 0.3.1 - -epc_dispatcher_get_cookie () -epc_dispatcher_get_cookieconst gchar* epc_dispatcher_get_cookie (EpcDispatcher *dispatcher); - -Queries the unique identifier of the service. -See "cookie" for details. - - -dispatcher : - a EpcDispatcher - -Returns : The unique identifier of the service, or NULL on error. - -Since 0.3.1 - -epc_dispatcher_get_name () -epc_dispatcher_get_nameconst gchar* epc_dispatcher_get_name (EpcDispatcher *dispatcher); - -Queries the user friendly name used for announcing services. -See "name". - - -dispatcher : - a EpcDispatcher - -Returns : The user friendly name of the service. - - - -epc_address_family_get_class () -epc_address_family_get_classGEnumClass* epc_address_family_get_class (void); - -Retrieves the GEnumClass describing the EpcAddressFamily enum. - - -Returns : The GEnumClass describing EpcAddressFamily. - - - -epc_address_family_to_string () -epc_address_family_to_stringconst gchar* epc_address_family_to_string (EpcAddressFamily value); - -Retrieves the name of a EpcAddressFamily value, or NULL when value is invalid. - - -value : - a EpcAddressFamily value - -Returns : The string representation of value, or NULL. - - - -epc_collision_handling_get_class () -epc_collision_handling_get_classGEnumClass* epc_collision_handling_get_class (void); - -Retrieves the GEnumClass describing the EpcCollisionHandling enum. - - -Returns : The GEnumClass describing EpcCollisionHandling. - - - -epc_collision_handling_to_string () -epc_collision_handling_to_stringconst gchar* epc_collision_handling_to_string (EpcCollisionHandling value); - -Retrieves the name of a EpcCollisionHandling value, or NULL when value is invalid. - - -value : - a EpcCollisionHandling value - -Returns : The string representation of value, or NULL. - - - - - -Property Details -The <literal>"collision-handling"</literal> property -EpcDispatcher:collision-handling "collision-handling" EpcCollisionHandling : Read / Write / Construct -The collision handling method to use.Default value: EPC_COLLISIONS_CHANGE_NAME - -The <literal>"cookie"</literal> property -EpcDispatcher:cookie "cookie" gchar* : Read / Write / Construct -Unique identifier of the service.Default value: NULL - -The <literal>"name"</literal> property -EpcDispatcher:name "name" gchar* : Read / Write / Construct -User friendly name of the service.Default value: NULL - - - - - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/password-dialog.xml libepc-0.4.2/docs/reference/libepc/xml/password-dialog.xml --- libepc-0.3.11/docs/reference/libepc/xml/password-dialog.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/password-dialog.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,375 +0,0 @@ - - - - - -EpcPasswordDialog -3 -LIBEPC-1.0 Library - - - -EpcPasswordDialog -common password dialog - - -Stability Level -Unstable, unless otherwise indicated - - - -Synopsis - - - -#include <libepc-ui/password-dialog.h> - - EpcPasswordDialogClass; - EpcPasswordDialogPrivate; - EpcPasswordDialog; - -GtkWidget* epc_password_dialog_new (const gchar *title, - GtkWindow *parent, - const gchar *realm, - const gchar *first_button_text, - ...); - -void epc_password_dialog_set_anonymous_allowed - (EpcPasswordDialog *dialog, - gboolean allowed); -gboolean epc_password_dialog_get_anonymous_allowed - (EpcPasswordDialog *dialog); -void epc_password_dialog_set_anonymous (EpcPasswordDialog *dialog, - gboolean anonymous); -gboolean epc_password_dialog_is_anonymous (EpcPasswordDialog *dialog); -void epc_password_dialog_set_username (EpcPasswordDialog *dialog, - const gchar *username); -const gchar* epc_password_dialog_get_username (EpcPasswordDialog *dialog); -void epc_password_dialog_set_password (EpcPasswordDialog *dialog, - const gchar *password); -const gchar* epc_password_dialog_get_password (EpcPasswordDialog *dialog); -void epc_password_dialog_set_realm (EpcPasswordDialog *dialog, - const gchar *realm); -const gchar* epc_password_dialog_get_realm (EpcPasswordDialog *dialog); - -void epc_password_dialog_attach (EpcPasswordDialog *dialog, - EpcConsumer *consumer); - - - - -Object Hierarchy - - GObject - +----GInitiallyUnowned - +----GtkObject - +----GtkWidget - +----GtkContainer - +----GtkBin - +----GtkWindow - +----GtkDialog - +----EpcPasswordDialog - - - - - - -Implemented Interfaces - -EpcPasswordDialog implements - AtkImplementorIface and GtkBuildable. - - - - -Properties - - "anonymous" gboolean : Read / Write / Construct - "anonymous-allowed" gboolean : Read / Write / Construct - "password" gchar* : Read / Write / Construct - "realm" gchar* : Read / Write / Construct - "username" gchar* : Read / Write / Construct - - - - - - -Description - -The EpcPasswordDialog provides an user interface -for the most common authentication scenarios. - - - - - -Details - -EpcPasswordDialogClass -EpcPasswordDialogClasstypedef struct { -} EpcPasswordDialogClass; - - -Virtual methods of the EpcPasswordDialog class. - - - -EpcPasswordDialogPrivate -EpcPasswordDialogPrivatetypedef struct _EpcPasswordDialogPrivate EpcPasswordDialogPrivate; - -Private fields of the EpcPasswordDialog class. - - - -EpcPasswordDialog -EpcPasswordDialogtypedef struct _EpcPasswordDialog EpcPasswordDialog; - -Public fields of the EpcPasswordDialog class. - - - -epc_password_dialog_new () -epc_password_dialog_newGtkWidget* epc_password_dialog_new (const gchar *title, - GtkWindow *parent, - const gchar *realm, - const gchar *first_button_text, - ...); - -Creates a new EpcPasswordDialog instance. - - -title : - title of the dialog, or NULL - -parent : - transient parent of the dialog, or NULL - -realm : - authentication realm, or NULL - -first_button_text : - stock ID or text to go in first button, or NULL - -... : - response ID for first button, then additional buttons, ending with NULL - -Returns : The newly created EpcEntropyWindow. - - - -epc_password_dialog_set_anonymous_allowed () -epc_password_dialog_set_anonymous_allowedvoid epc_password_dialog_set_anonymous_allowed - (EpcPasswordDialog *dialog, - gboolean allowed); - -Toggles anonymous authentication support. With anonymous authentication -support an aditional checkbox for requesting anonymous authentication is -shown. See "anonymous-allowed" for details. - - -See also: epc_password_dialog_set_anonymous() - - -dialog : - a EpcPasswordDialog - -allowed : - the new anonymous authentication support flag - - - -epc_password_dialog_get_anonymous_allowed () -epc_password_dialog_get_anonymous_allowedgboolean epc_password_dialog_get_anonymous_allowed - (EpcPasswordDialog *dialog); - -Queries if anonymous authentication is supported. With anonymous -authentication support an aditional checkbox for requesting anonymous -authentication is shown. See "anonymous-allowed" for -details. - - -See also: epc_password_dialog_is_anonymous() - - -dialog : - a EpcPasswordDialog - -Returns : TRUE if anonymous authentication is supported. - - - -epc_password_dialog_set_anonymous () -epc_password_dialog_set_anonymousvoid epc_password_dialog_set_anonymous (EpcPasswordDialog *dialog, - gboolean anonymous); - -See also: epc_password_dialog_set_anonymous_allowed() - - -Changes the anonymous authentication state. -See "anonymous" for details. - - -dialog : - a EpcPasswordDialog - -anonymous : - the new anonymous authentication state - - - -epc_password_dialog_is_anonymous () -epc_password_dialog_is_anonymousgboolean epc_password_dialog_is_anonymous (EpcPasswordDialog *dialog); - -Queries if anonymous authentication is requested. -See "anonymous" for details. - - -See also: epc_password_dialog_get_anonymous_allowed() - - -dialog : - a EpcPasswordDialog - -Returns : TRUE if anonymous authentication is requested. - - - -epc_password_dialog_set_username () -epc_password_dialog_set_usernamevoid epc_password_dialog_set_username (EpcPasswordDialog *dialog, - const gchar *username); - -Changes the current user name of the dialog. -See "username" for details. - - -dialog : - a EpcPasswordDialog - -username : - the new username - - - -epc_password_dialog_get_username () -epc_password_dialog_get_usernameconst gchar* epc_password_dialog_get_username (EpcPasswordDialog *dialog); - -Queries the current user name of the dialog. -See "username" for details. - - -dialog : - a EpcPasswordDialog - -Returns : the current user name of the dialog. - - - -epc_password_dialog_set_password () -epc_password_dialog_set_passwordvoid epc_password_dialog_set_password (EpcPasswordDialog *dialog, - const gchar *password); - -Changes the current password of the dialog. -See "password" for details. - - -dialog : - a EpcPasswordDialog - -password : - the new password - - - -epc_password_dialog_get_password () -epc_password_dialog_get_passwordconst gchar* epc_password_dialog_get_password (EpcPasswordDialog *dialog); - -Queries the current password of the dialog. -See "password" for details. - - -dialog : - a EpcPasswordDialog - -Returns : the current password of the dialog. - - - -epc_password_dialog_set_realm () -epc_password_dialog_set_realmvoid epc_password_dialog_set_realm (EpcPasswordDialog *dialog, - const gchar *realm); - -Changes the authentication realm the dialog shows. -See "realm" for details. - - -dialog : - a EpcPasswordDialog - -realm : - the new realm - - - -epc_password_dialog_get_realm () -epc_password_dialog_get_realmconst gchar* epc_password_dialog_get_realm (EpcPasswordDialog *dialog); - -Queries the authentication realm of the dialog. -See "realm" for details. - - -dialog : - a EpcPasswordDialog - -Returns : the current realm of the dialog. - - - -epc_password_dialog_attach () -epc_password_dialog_attachvoid epc_password_dialog_attach (EpcPasswordDialog *dialog, - EpcConsumer *consumer); - -Installs a EpcPasswordDialog as authentication handler for some -EpcConsumer by connecting to its "authenticate" and -"reauthenticate" signals. - - -dialog : - a EpcPasswordDialog - -consumer : - the EpcConsumer - - - - - -Property Details -The <literal>"anonymous"</literal> property -EpcPasswordDialog:anonymous "anonymous" gboolean : Read / Write / Construct -Try to use anonymous authentication.Default value: FALSE - -The <literal>"anonymous-allowed"</literal> property -EpcPasswordDialog:anonymous-allowed "anonymous-allowed" gboolean : Read / Write / Construct -Show widget to allow anonymous authentication.Default value: TRUE - -The <literal>"password"</literal> property -EpcPasswordDialog:password "password" gchar* : Read / Write / Construct -The password to use for authentication.Default value: NULL - -The <literal>"realm"</literal> property -EpcPasswordDialog:realm "realm" gchar* : Read / Write / Construct -The authentication realm the dialog is used for.Default value: NULL - -The <literal>"username"</literal> property -EpcPasswordDialog:username "username" gchar* : Read / Write / Construct -The username to use for authentication.Default value: "david" - - - - - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/progress-window.xml libepc-0.4.2/docs/reference/libepc/xml/progress-window.xml --- libepc-0.3.11/docs/reference/libepc/xml/progress-window.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/progress-window.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,195 +0,0 @@ - - - - - -EpcProgressWindow -3 -LIBEPC-1.0 Library - - - -EpcProgressWindow -provide feedback during lengthly operations - - -Stability Level -Unstable, unless otherwise indicated - - - -Synopsis - - - -#include <libepc-ui/progress-window.h> - - EpcProgressWindowClass; - EpcProgressWindowPrivate; - EpcProgressWindow; -GtkWidget* epc_progress_window_new (const gchar *title, - GtkWindow *parent, - const gchar *message); -void epc_progress_window_update (EpcProgressWindow *window, - gdouble progress, - const gchar *message); -void epc_progress_window_install (GtkWindow *parent); - - - - -Object Hierarchy - - GObject - +----GInitiallyUnowned - +----GtkObject - +----GtkWidget - +----GtkContainer - +----GtkBin - +----GtkWindow - +----EpcProgressWindow - - - - - - -Implemented Interfaces - -EpcProgressWindow implements - AtkImplementorIface and GtkBuildable. - - - - -Properties - - "message" gchar* : Read / Write / Construct - "progress" gdouble : Read / Write / Construct - "title" gchar* : Read / Write / Construct - - - - - - -Description - -The EpcProgressWindow can be used to provide some feedback during -lengthly operations, like generating server keys. - - -See also: epc_tls_private_key_new() - - - - - -Details - -EpcProgressWindowClass -EpcProgressWindowClasstypedef struct { -} EpcProgressWindowClass; - - -Virtual methods of the EpcProgressWindow class. - - - -EpcProgressWindowPrivate -EpcProgressWindowPrivatetypedef struct _EpcProgressWindowPrivate EpcProgressWindowPrivate; - -Private fields of the EpcProgressWindow class. - - - -EpcProgressWindow -EpcProgressWindowtypedef struct _EpcProgressWindow EpcProgressWindow; - -Public fields of the EpcProgressWindow class. - - - -epc_progress_window_new () -epc_progress_window_newGtkWidget* epc_progress_window_new (const gchar *title, - GtkWindow *parent, - const gchar *message); - -Creates a new EpcProgressWindow instance. - - -title : - the title of the window - -parent : - the transient parent of the window, or NULL - -message : - the message to show, or NULL - -Returns : The newly created EpcProgressWindow. - - - -epc_progress_window_update () -epc_progress_window_updatevoid epc_progress_window_update (EpcProgressWindow *window, - gdouble progress, - const gchar *message); - -Updates the EpcProgressWindow with new progress information. The progress -is expressed as percentage in the range [0..1], or -1 if the progress cannot -be estimated. - - -See also: "message", "progress" - - -window : - a EpcProgressWindow - -progress : - the current progress, or -1 - -message : - a description of the current progress - - - -epc_progress_window_install () -epc_progress_window_installvoid epc_progress_window_install (GtkWindow *parent); - -Configures the hooks provided by libepc to use EpcProgressWindow when for -performing long standing tasks like for instance generating private keys. - - -See also: epc_tls_set_private_key_hooks() - - -parent : - the transient parent of the window, or NULL - - - - - -Property Details -The <literal>"message"</literal> property -EpcProgressWindow:message "message" gchar* : Read / Write / Construct -The progress message to show.Default value: NULL - -The <literal>"progress"</literal> property -EpcProgressWindow:progress "progress" gdouble : Read / Write / Construct -Current progress, or -1.Allowed values: [-1,1] -Default value: -1 - -The <literal>"title"</literal> property -EpcProgressWindow:title "title" gchar* : Read / Write / Construct -The title to show.Default value: NULL - - - - - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/protocol.xml libepc-0.4.2/docs/reference/libepc/xml/protocol.xml --- libepc-0.3.11/docs/reference/libepc/xml/protocol.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/protocol.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,207 +0,0 @@ - - - - - -EpcProtocol -3 -LIBEPC-1.0 Library - - - -EpcProtocol -transport protocols - - -Stability Level -Unstable, unless otherwise indicated - - - -Synopsis - - - -#include <libepc/protcol.h> - -enum EpcProtocol; -EpcProtocol epc_protocol_from_name (const gchar *name, - EpcProtocol fallback); -gchar* epc_protocol_build_uri (EpcProtocol protocol, - const gchar *hostname, - guint16 port, - const gchar *path); -const gchar* epc_protocol_get_service_type (EpcProtocol protocol); -const gchar* epc_protocol_get_uri_scheme (EpcProtocol protocol); -GEnumClass* epc_protocol_get_class (void); -const gchar* epc_protocol_to_string (EpcProtocol value); - - - - - - - - - - - - -Description - -Since the Easy Publish and Consume library hides the details of the -transport mechanism used, it is possible to support different mechanisms. -Currently there is support for HTTP and HTTPS. - - -The EpcProtocol enumeration is the maximum of information libepc wants to -expose regarding its transport mechanisms. - - - - - -Details - -enum EpcProtocol -EpcProtocoltypedef enum -{ - EPC_PROTOCOL_UNKNOWN, - EPC_PROTOCOL_HTTP, - EPC_PROTOCOL_HTTPS -} -EpcProtocol; - - -The transport protocols supported by libepc. - - - -EPC_PROTOCOL_UNKNOWN - Used when the transport protocol is not known yet. - - - -EPC_PROTOCOL_HTTP - Plain HTTP. Passwords are protected using HTTP digest -authentication, remaining data is transfered without any encryption. - - - -EPC_PROTOCOL_HTTPS - Encrypted HTTP. Attempts are made to use this -transport method when ever possible. - - - - -epc_protocol_from_name () -epc_protocol_from_nameEpcProtocol epc_protocol_from_name (const gchar *name, - EpcProtocol fallback); - -Parses the protocol name. Case of the name doesn't matter. Returns the -matching EpcProtocol, when the name was recognized, and the value of -fallback otherwise. - - -name : - a protocol name - -fallback : - the EpcProtocol to use on errors - -Returns : The EpcProtocol matching name, or fallback on error. - - - -epc_protocol_build_uri () -epc_protocol_build_urigchar* epc_protocol_build_uri (EpcProtocol protocol, - const gchar *hostname, - guint16 port, - const gchar *path); - -Builds the Unified Resource Identifier (URI) for a service. -The returned string should be released when no longer needed. - - -protocol : - a EpcProtocol - -hostname : - the host to contact - -port : - the service port - -path : - the service path, or NULL - -Returns : A newly allocated string with the URI for the service, -or NULL on error. - - - -epc_protocol_get_service_type () -epc_protocol_get_service_typeconst gchar* epc_protocol_get_service_type (EpcProtocol protocol); - -Queries the DNS-SD service type associated with a EpcProtocol. -See EPC_SERVICE_TYPE_HTTP, EPC_SERVICE_TYPE_HTTPS. - - -protocol : - a EpcProtocol - -Returns : Returns the DNS-SD service type associated -with protocol, or NULL on unknown protocols. - - - -epc_protocol_get_uri_scheme () -epc_protocol_get_uri_schemeconst gchar* epc_protocol_get_uri_scheme (EpcProtocol protocol); - -Queries the URI scheme associated with a EpcProtocol. -See epc_service_type_build_uri(). - - -protocol : - a EpcProtocol - -Returns : Returns the URI scheme associated with protocol, -or NULL on unknown protocols. - - - -epc_protocol_get_class () -epc_protocol_get_classGEnumClass* epc_protocol_get_class (void); - -Retrieves the GEnumClass describing the EpcProtocol enum. - - -Returns : The GEnumClass describing EpcProtocol. - - - -epc_protocol_to_string () -epc_protocol_to_stringconst gchar* epc_protocol_to_string (EpcProtocol value); - -Retrieves the name of a EpcProtocol value, or NULL when value is invalid. - - -value : - a EpcProtocol value - -Returns : The string representation of value, or NULL. - - - - - - - - -See Also -epc_service_type_new() - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/publisher.xml libepc-0.4.2/docs/reference/libepc/xml/publisher.xml --- libepc-0.3.11/docs/reference/libepc/xml/publisher.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/publisher.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,1018 +0,0 @@ - - - - - -EpcPublisher -3 -LIBEPC-1.0 Library - - - -EpcPublisher -easily publish values - - -Stability Level -Unstable, unless otherwise indicated - - - -Synopsis - - - -#include <libepc/publish.h> - -EpcContents * (*EpcContentsHandler) (EpcPublisher *publisher, - const gchar *key, - gpointer user_data); - EpcPublisherPrivate; - EpcPublisherClass; - EpcPublisher; - -EpcPublisher* epc_publisher_new (const gchar *name, - const gchar *application, - const gchar *domain); - -void epc_publisher_add (EpcPublisher *publisher, - const gchar *key, - gconstpointer data, - gssize length); -void epc_publisher_add_file (EpcPublisher *publisher, - const gchar *key, - const gchar *filename); -void epc_publisher_add_handler (EpcPublisher *publisher, - const gchar *key, - EpcContentsHandler handler, - gpointer user_data, - GDestroyNotify destroy_data); -void epc_publisher_add_bookmark (EpcPublisher *publisher, - const gchar *key, - const gchar *label); -gchar* epc_publisher_get_path (EpcPublisher *publisher, - const gchar *key); -gchar* epc_publisher_get_uri (EpcPublisher *publisher, - const gchar *key, - GError **error); -gboolean epc_publisher_has_key (EpcPublisher *publisher, - const gchar *key); -gpointer epc_publisher_lookup (EpcPublisher *publisher, - const gchar *key); -gboolean epc_publisher_remove (EpcPublisher *publisher, - const gchar *key); -GList* epc_publisher_list (EpcPublisher *publisher, - const gchar *pattern); - -gboolean epc_publisher_run (EpcPublisher *publisher, - GError **error); -gboolean epc_publisher_run_async (EpcPublisher *publisher, - GError **error); -gboolean epc_publisher_quit (EpcPublisher *publisher); - -gchar* epc_publisher_expand_name (const gchar *name, - GError **error); - -void epc_publisher_set_auth_flags (EpcPublisher *publisher, - EpcAuthFlags flags); -void epc_publisher_set_auth_handler (EpcPublisher *publisher, - const gchar *key, - EpcAuthHandler handler, - gpointer user_data, - GDestroyNotify destroy_data); -void epc_publisher_set_collision_handling - (EpcPublisher *publisher, - EpcCollisionHandling method); -void epc_publisher_set_contents_path (EpcPublisher *publisher, - const gchar *path); -void epc_publisher_set_credentials (EpcPublisher *publisher, - const gchar *certfile, - const gchar *keyfile); -void epc_publisher_set_protocol (EpcPublisher *publisher, - EpcProtocol protocol); -void epc_publisher_set_service_cookie (EpcPublisher *publisher, - const gchar *cookie); -void epc_publisher_set_service_name (EpcPublisher *publisher, - const gchar *name); - -EpcAuthFlags epc_publisher_get_auth_flags (EpcPublisher *publisher); -const gchar* epc_publisher_get_certificate_file (EpcPublisher *publisher); -EpcCollisionHandling epc_publisher_get_collision_handling - (EpcPublisher *publisher); -const gchar* epc_publisher_get_contents_path (EpcPublisher *publisher); -const gchar* epc_publisher_get_private_key_file (EpcPublisher *publisher); -EpcProtocol epc_publisher_get_protocol (EpcPublisher *publisher); -const gchar* epc_publisher_get_service_cookie (EpcPublisher *publisher); -const gchar* epc_publisher_get_service_domain (EpcPublisher *publisher); -const gchar* epc_publisher_get_service_name (EpcPublisher *publisher); - - - - -Object Hierarchy - - GObject - +----EpcPublisher - - - - - - - - -Properties - - "application" gchar* : Read / Write / Construct - "auth-flags" EpcAuthFlags : Read / Write / Construct - "certificate-file" gchar* : Read / Write / Construct - "collision-handling" EpcCollisionHandling : Read / Write / Construct - "contents-path" gchar* : Read / Write / Construct - "private-key-file" gchar* : Read / Write / Construct - "protocol" EpcProtocol : Read / Write / Construct - "service-cookie" gchar* : Read / Write / Construct - "service-domain" gchar* : Read / Write / Construct - "service-name" gchar* : Read / Write / Construct - - - - - - -Description - -The EpcPublisher starts a HTTP server to publish information. -To allow EpcConsumer to find the publisher it automatically publishes -its contact information (host name, TCP/IP port) per DNS-SD. - - -In future it might use DNS-DS to notify EpcConsumer of changes. - - - - Publish a value - - publisher = epc_publisher_new ("Easy Publisher Example", NULL, NULL); - - epc_publisher_add (publisher, "maman", "bar", -1); - epc_publisher_add_file (publisher, "source-code", __FILE__); - - epc_publisher_run (NULL); - - - - -EpcPublisher doesn't provide a way to explicitly publish NULL values, as -publishing NULL values doesn't seem very valueable in our scenario: Usually -you want to "publish" NULL values to express, that your application doesn't -have any meaningful information for the requested identifier. By "publishing" -a NULL value essentially you say "this information does not exist". So -publishing NULL values is not different from not publishing any value at -all or rejected access to some values. Without explicitly inspecting the -details for not receiving a value, a consumer calling epc_consumer_lookup() -has no chance to distinguish between the cases "never published", "network -problem", "authorization rejected", "no meaningful value available". - - -So if feel like publishing a NULL value, just remove the key in question -from the EpcPublisher by calling epc_publisher_remove(). When using a -custom EpcContentsHandler an alternate approach is returning NULL from -that handler. In that case the EpcPublisher will behave exactly the same, -as if the value has been removed. - - - - - -Details - -EpcContentsHandler () -EpcContentsHandlerEpcContents * (*EpcContentsHandler) (EpcPublisher *publisher, - const gchar *key, - gpointer user_data); - -This callback is used to generate custom contents published with the -epc_publisher_add_handler function. The arguments passed are the same as -passed to epc_publisher_add_handler. The EpcPublisher will decrease the -reference count of the returned buffer after deliving it. It's valid to -return NULL in situations were no contents can be generated. - - -publisher : - the EpcPublisher - -key : - the unique key - -user_data : - user data set when the signal handler was installed - -Returns : The EpcContents buffer for this publication, or NULL. - - - -EpcPublisherPrivate -EpcPublisherPrivatetypedef struct _EpcPublisherPrivate EpcPublisherPrivate; - -Private fields of the EpcPublisher class. - - - -EpcPublisherClass -EpcPublisherClasstypedef struct { -} EpcPublisherClass; - - -Virtual methods of the EpcPublisher class. - - - -EpcPublisher -EpcPublishertypedef struct _EpcPublisher EpcPublisher; - -Public fields of the EpcPublisher class. - - - -epc_publisher_new () -epc_publisher_newEpcPublisher* epc_publisher_new (const gchar *name, - const gchar *application, - const gchar *domain); - -Creates a new EpcPublisher object. The publisher announces its service -per DNS-SD to the DNS domain specified by domain, using name as service -name. The service type is derived from application. When NULL is passed -for application the value returned by g_get_prgname() is used. See -epc_service_type_new() for details. - - -name : - the human friendly service name, or NULL - -application : - application name used for DNS-SD service type, or NULL - -domain : - the DNS domain for announcing the service, or NULL - -Returns : The newly created EpcPublisher object. - - - -epc_publisher_add () -epc_publisher_addvoid epc_publisher_add (EpcPublisher *publisher, - const gchar *key, - gconstpointer data, - gssize length); - -Publishes a new value on the EpcPublisher using the unique key for -addressing. When -1 is passed for length, data is expected to be a -null-terminated string and its length in bytes is determined automatically -using strlen. - - - - Values published by the EpcPublisher can be arbitrary data, possibly - including null characters in the middle. The kind of data associated - with a key is chosen by the application providing values and should - be specified separately. - - - However, when publishing plain text it is strongly recommended - to use UTF-8 encoding to avoid internationalization issues. - - - -publisher : - a EpcPublisher - -key : - the key for addressing the value - -data : - the value to publish - -length : - the length of data in bytes, or -1 if data is a null-terminated string. - - - -epc_publisher_add_file () -epc_publisher_add_filevoid epc_publisher_add_file (EpcPublisher *publisher, - const gchar *key, - const gchar *filename); - -Publishes a local file on the EpcPublisher using the unique -key for addressing. The publisher delivers the current contents -of the file at the time of access. - - -publisher : - a EpcPublisher - -key : - the key for addressing the file - -filename : - the name of the file to publish - - - -epc_publisher_add_handler () -epc_publisher_add_handlervoid epc_publisher_add_handler (EpcPublisher *publisher, - const gchar *key, - EpcContentsHandler handler, - gpointer user_data, - GDestroyNotify destroy_data); - -Publishes contents on the EpcPublisher which are generated by a custom -EpcContentsHandler callback. This is the most flexible method for publishing -information. - - -The handler is called on every request matching key. -When called, publisher, key and user_data are passed to the handler. -When replacing or deleting the resource referenced by key, -or when the the Publisher is destroyed, the function -described by destroy_data is called with user_data as argument. - - -publisher : - a EpcPublisher - -key : - the key for addressing the contents - -handler : - the EpcContentsHandler for handling this contents - -user_data : - data to pass on handler calls - -destroy_data : - a function for releasing user_data - - - -epc_publisher_add_bookmark () -epc_publisher_add_bookmarkvoid epc_publisher_add_bookmark (EpcPublisher *publisher, - const gchar *key, - const gchar *label); - -Installs a dynamic HTTP (respectively HTTPS) bookmark for key. -This allows consumption of EpcPublisher resources by foreign -applications that support ZeroConf bookmarks, but not libepc. -This is useful for instance for publishing media playlists. - - -Passing NULL as key installs a bookmark for the root context of the -builtin web server. When passing NULL as label the publisher's name -is used as bookmark label. - - - - Dynamic bookmarks must be unique within the service domain. - Therefore the label will get modified on name collisions. - - - - - This should be called after adding the resource identified by key, - not before. For instance, after calling epc_publisher_add(). - - - -publisher : - a EpcResource - -key : - the key of the resource to publish, or NULL - -label : - the bookmark's label, or NULL - - - -epc_publisher_get_path () -epc_publisher_get_pathgchar* epc_publisher_get_path (EpcPublisher *publisher, - const gchar *key); - -Queries the path component of the URI used to publish the resource -associated with key. This is useful when referencing keys in published -resources. Passing NULL as key retrieve the path of the root context. - - -publisher : - a EpcPublisher - -key : - the resource key to inspect, or NULL. - -Returns : The resource path for key. - - - -epc_publisher_get_uri () -epc_publisher_get_urigchar* epc_publisher_get_uri (EpcPublisher *publisher, - const gchar *key, - GError **error); - -Queries the URI used to publish the resource associated with key. -This is useful when referencing keys in published resources. When -passing NULL the publisher's base URI is returned. - - -The function fails if the publisher's host name cannot be retrieved. -In that case NULL is returned and error is set. The error domain is -EPC_AVAHI_ERROR. Possible error codes are those of the -Avahi library. - - -publisher : - a EpcPublisher - -key : - the resource key to inspect, or NULL - -error : - return location for a GError, or NULL - -Returns : The fully qualified URI for key, or NULL on error. - - - -epc_publisher_has_key () -epc_publisher_has_keygboolean epc_publisher_has_key (EpcPublisher *publisher, - const gchar *key); - -Checks if information is published for key. - - -This function allows to use the publisher as local key/value store, -which is useful for instance to prevent accidental key collisions. - - -See also: epc_publisher_lookup. - - -publisher : - a EcpPublisher - -key : - the key for addressing contents - -Returns : TRUE when the publisher has information for key, -and FALSE otherwise. - - - -epc_publisher_lookup () -epc_publisher_lookupgpointer epc_publisher_lookup (EpcPublisher *publisher, - const gchar *key); - -Looks up the user_data passed to epc_publisher_add_handler() for key. -Returns NULL if the specified key doesn't exist or wasn't published -with epc_publisher_add_handler(). - - -This function allows to use the publisher as local key/value store, -which is useful for instance to prevent accidental key collisions. - - -See also: epc_publisher_has_key. - - -publisher : - a EcpPublisher - -key : - the key for addressing contents - -Returns : The user_data associated with key, or NULL. - - - -epc_publisher_remove () -epc_publisher_removegboolean epc_publisher_remove (EpcPublisher *publisher, - const gchar *key); - -Removes a key and its associated contents from a EpcPublisher. - - -publisher : - a EpcPublisher - -key : - the key for addressing the contents - -Returns : TRUE if the key was found and removed from the EpcPublisher. - - - -epc_publisher_list () -epc_publisher_listGList* epc_publisher_list (EpcPublisher *publisher, - const gchar *pattern); - -Matches published keys against patterns containing '*' (wildcard) and '?' -(joker). Passing NULL as pattern is equivalent to passing "*" and returns -all published keys. This function is useful for generating dynamic resource -listings in other formats than libepc's specific format. See GPatternSpec -for information about glob-style patterns. - - -If the call was successful, a list of keys matching pattern is returned. -If the call was not successful, it returns NULL. - - -The returned list should be freed when no longer needed: - - - - g_list_foreach (keys, (GFunc) g_free, NULL); - g_list_free (keys); - - - -See also epc_consumer_list() for builtin listing capabilities. - - -publisher : - a EpcPublisher - -pattern : - a glob-style pattern, or NULL - -Returns : A newly allocated list of keys, or NULL when an error occurred. - - - -epc_publisher_run () -epc_publisher_rungboolean epc_publisher_run (EpcPublisher *publisher, - GError **error); - -Starts the server component of the EpcPublisher and blocks until it is -shutdown using epc_publisher_quit(). If the server could not be started, the -function returns FALSE and sets error. The error domain is -EPC_AVAHI_ERROR. Possible error codes are those of the -Avahi library. - - -When starting the publisher in HTTPS mode for the first time self-signed -keys must be generated. Generating secure keys needs some time, -so it is recommended to call epc_progress_window_install(), or -epc_shell_set_progress_hooks() to provide visual feedback during that -operation. Key generation takes place in a separate background thread and -the calling thread waits in a GMainLoop. Therefore the UI can remain -responsive when generating keys. - - -To start the server without blocking call epc_publisher_run_async(). - - -publisher : - a EpcPublisher - -error : - return location for a GError, or NULL - -Returns : TRUE when the publisher was successfully started, -FALSE if an error occurred. - - - -epc_publisher_run_async () -epc_publisher_run_asyncgboolean epc_publisher_run_async (EpcPublisher *publisher, - GError **error); - -Starts the server component of the EpcPublisher without blocking. If the -server could not be started then the function returns FALSE and sets error. The -error domain is EPC_AVAHI_ERROR. Possible error codes are those of the -Avahi library. - - -To stop the server component call epc_publisher_quit(). -See epc_publisher_run() for additional information. - - -publisher : - a EpcPublisher - -error : - return location for a GError, or NULL - -Returns : TRUE when the publisher was successfully started, -FALSE if an error occurred. - - - -epc_publisher_quit () -epc_publisher_quitgboolean epc_publisher_quit (EpcPublisher *publisher); - -Stops the server component of the EpcPublisher started with -epc_publisher_run() or epc_publisher_run_async. The functions -returns TRUE when the built-in server was running and had to -be stopped. If the server wasn't running the function returns -FALSE. - - -publisher : - a EpcPublisher - -Returns : TRUE when the server had to be stopped, and FALSE otherwise. - - - -epc_publisher_expand_name () -epc_publisher_expand_namegchar* epc_publisher_expand_name (const gchar *name, - GError **error); - -Expands all known placeholders in name. Supported placeholders are: - - - - %a: the program name as returned by g_get_application_name() - %h: the machine's host name in title case - %u: the user's login name in title case - %U: the user's real name - %%: the percent sign - - - -The function fails when the host name cannot looked up. In that case NULL -is returned and error is set. The error domain is EPC_AVAHI_ERROR. -Possible error codes are those of the Avahi library. - - -name : - a service name with placeholders - -error : - return location for a GError, or NULL - -Returns : The name with all known placeholders expanded, or NULL on error. - - - -epc_publisher_set_auth_flags () -epc_publisher_set_auth_flagsvoid epc_publisher_set_auth_flags (EpcPublisher *publisher, - EpcAuthFlags flags); - -Changes the authentication settings the publisher uses -when epc_publisher_set_auth_handler() is used. -See "auth-flags" for details. - - -publisher : - a EpcPublisher - -flags : - new authentication settings - - - -epc_publisher_set_auth_handler () -epc_publisher_set_auth_handlervoid epc_publisher_set_auth_handler (EpcPublisher *publisher, - const gchar *key, - EpcAuthHandler handler, - gpointer user_data, - GDestroyNotify destroy_data); - -Installs an authentication handler for the specified key. -Passing NULL as key installs a fallback handler for all resources. - - -The handler is called on every request matching key. On this call -a temporary EpcAuthContext and user_data are passed to the handler. -The EpcAuthContext references the publisher and key passed here. -When replacing or deleting the resource referenced by key, or when -the publisher is destroyed, the function -described by destroy_data is called with user_data as argument. - - - - This should be called after adding the resource identified by key, - not before. For instance, after calling epc_publisher_add(). - - - -See also epc_publisher_set_auth_flags(). - - -publisher : - a EpcPublisher - -key : - the key of the resource to protect, or NULL - -handler : - the EpcAuthHandler to connect - -user_data : - data to pass on handler calls - -destroy_data : - a function for releasing user_data - - - -epc_publisher_set_collision_handling () -epc_publisher_set_collision_handlingvoid epc_publisher_set_collision_handling - (EpcPublisher *publisher, - EpcCollisionHandling method); - -Changes the collision handling strategy the publisher uses. -See "collision-handling" for details. - - -publisher : - a EpcPublisher - -method : - the new strategy - -Since 0.3.1 - -epc_publisher_set_contents_path () -epc_publisher_set_contents_pathvoid epc_publisher_set_contents_path (EpcPublisher *publisher, - const gchar *path); - -Changes the server path used for publishing contents. -See "contents-path" for details. - - -publisher : - a EpcPublisher - -path : - the new contents path - - - -epc_publisher_set_credentials () -epc_publisher_set_credentialsvoid epc_publisher_set_credentials (EpcPublisher *publisher, - const gchar *certfile, - const gchar *keyfile); - -Changes the file names of the PEM encoded TLS credentials the publisher use -for its services, when the transport "protocol" is -EPC_PROTOCOL_HTTPS. - - -See "certificate-file" and -"private-key-file" for details. - - -publisher : - a EpcPublisher - -certfile : - file name of the server certificate - -keyfile : - file name of the private key - - - -epc_publisher_set_protocol () -epc_publisher_set_protocolvoid epc_publisher_set_protocol (EpcPublisher *publisher, - EpcProtocol protocol); - -Changes the transport protocol the publisher uses. -See "protocol" for details. - - -publisher : - a EpcPublisher - -protocol : - the transport protocol - - - -epc_publisher_set_service_cookie () -epc_publisher_set_service_cookievoid epc_publisher_set_service_cookie (EpcPublisher *publisher, - const gchar *cookie); - -Changes the unique identifier of the service. -See "service-cookie" for details. - - -publisher : - a EpcPublisher - -cookie : - the new service identifier, or NULL - -Since 0.3.1 - -epc_publisher_set_service_name () -epc_publisher_set_service_namevoid epc_publisher_set_service_name (EpcPublisher *publisher, - const gchar *name); - -Changes the human friendly name this EpcPublisher uses to announce its -service. See "service-name" for details. - - -publisher : - a EpcPublisher - -name : - the new name of this EpcPublisher - - - -epc_publisher_get_auth_flags () -epc_publisher_get_auth_flagsEpcAuthFlags epc_publisher_get_auth_flags (EpcPublisher *publisher); - -Queries the current authentication settings of the publisher. -See "auth-flags" for details. - - -publisher : - a EpcPublisher - -Returns : The authentication settings of the publisher, -or EPC_AUTH_DEFAULT on error. - - - -epc_publisher_get_certificate_file () -epc_publisher_get_certificate_fileconst gchar* epc_publisher_get_certificate_file (EpcPublisher *publisher); - -Queries the file name of the PEM encoded server certificate. -See "certificate-file" for details. - - -publisher : - a EpcPublisher - -Returns : The certificate's file name, or NULL. - - - -epc_publisher_get_collision_handling () -epc_publisher_get_collision_handlingEpcCollisionHandling epc_publisher_get_collision_handling - (EpcPublisher *publisher); - -Queries the collision handling strategy the publisher uses. -See "collision-handling" for details. - - -publisher : - a EpcPublisher - -Returns : The publisher's collision handling strategy, -or EPC_COLLISIONS_IGNORE on error. - -Since 0.3.1 - -epc_publisher_get_contents_path () -epc_publisher_get_contents_pathconst gchar* epc_publisher_get_contents_path (EpcPublisher *publisher); - -Queries the server path used for publishing contents. -See "contents-path" for details. - - -publisher : - a EpcPublisher - -Returns : The server's contents path. - - - -epc_publisher_get_private_key_file () -epc_publisher_get_private_key_fileconst gchar* epc_publisher_get_private_key_file (EpcPublisher *publisher); - -Queries the file name of the PEM encoded private server key. -See "private-key-file" for details. - - -publisher : - a EpcPublisher - -Returns : The private key's file name, or NULL. - - - -epc_publisher_get_protocol () -epc_publisher_get_protocolEpcProtocol epc_publisher_get_protocol (EpcPublisher *publisher); - -Queries the transport protocol the publisher uses. -See "protocol" for details. - - -publisher : - a EpcPublisher - -Returns : The transport protocol the publisher uses, -or EPC_PROTOCOL_UNKNOWN on error. - - - -epc_publisher_get_service_cookie () -epc_publisher_get_service_cookieconst gchar* epc_publisher_get_service_cookie (EpcPublisher *publisher); - -Queries the unique identifier of the service. -See "service-cookie" for details. - - -publisher : - a EpcPublisher - -Returns : The unique identifier of the service, or NULL on error. - -Since 0.3.1 - -epc_publisher_get_service_domain () -epc_publisher_get_service_domainconst gchar* epc_publisher_get_service_domain (EpcPublisher *publisher); - -Queries the DNS domain for which this EpcPublisher announces its service. -See "domain" for details. - - -publisher : - a EpcPublisher - -Returns : The DNS-SD domain of this EpcPublisher, or NULL. - - - -epc_publisher_get_service_name () -epc_publisher_get_service_nameconst gchar* epc_publisher_get_service_name (EpcPublisher *publisher); - -Queries the human friendly name this EpcPublisher uses -to announce its service. See "name" for details. - - -publisher : - a EpcPublisher - -Returns : The human friendly name of this EpcPublisher. - - - - - -Property Details -The <literal>"application"</literal> property -EpcPublisher:application "application" gchar* : Read / Write / Construct -Program name for deriving the service type.Default value: NULL - -The <literal>"auth-flags"</literal> property -EpcPublisher:auth-flags "auth-flags" EpcAuthFlags : Read / Write / Construct -The authentication settings to use. -The <literal>"certificate-file"</literal> property -EpcPublisher:certificate-file "certificate-file" gchar* : Read / Write / Construct -File name for the PEM encoded server certificate.Default value: NULL - -The <literal>"collision-handling"</literal> property -EpcPublisher:collision-handling "collision-handling" EpcCollisionHandling : Read / Write / Construct - -The collision handling strategy the publisher uses. - -Default value: EPC_COLLISIONS_CHANGE_NAME -Since 0.3.1 - -The <literal>"contents-path"</literal> property -EpcPublisher:contents-path "contents-path" gchar* : Read / Write / Construct -The built-in server path for publishing resources.Default value: "/contents" - -The <literal>"private-key-file"</literal> property -EpcPublisher:private-key-file "private-key-file" gchar* : Read / Write / Construct -File name for the PEM encoded private server key.Default value: NULL - -The <literal>"protocol"</literal> property -EpcPublisher:protocol "protocol" EpcProtocol : Read / Write / Construct -The transport protocol the publisher uses.Default value: EPC_PROTOCOL_HTTPS - -The <literal>"service-cookie"</literal> property -EpcPublisher:service-cookie "service-cookie" gchar* : Read / Write / Construct - -Unique identifier of the service. This cookie is used for implementing -EPC_COLLISIONS_UNIQUE_SERVICE, and usually is a UUID or the MD5/SHA1/... -checksum of a central document. When passing NULL, but using the -EPC_COLLISIONS_UNIQUE_SERVICE strategy a time based UUID is -generated and used as service identifier. - -Default value: NULL -Since 0.3.1 - -The <literal>"service-domain"</literal> property -EpcPublisher:service-domain "service-domain" gchar* : Read / Write / Construct -Internet domain for publishing the service.Default value: NULL - -The <literal>"service-name"</literal> property -EpcPublisher:service-name "service-name" gchar* : Read / Write / Construct -User friendly name for the service.Default value: NULL - - - - - - -See Also -#EpcConsumer, EpcAuthContext, EpcContentsHandler - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/service-info.xml libepc-0.4.2/docs/reference/libepc/xml/service-info.xml --- libepc-0.3.11/docs/reference/libepc/xml/service-info.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/service-info.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,279 +0,0 @@ - - - - - -EpcServiceInfo -3 -LIBEPC-1.0 Library - - - -EpcServiceInfo -DNS-SD service descriptions - - -Stability Level -Unstable, unless otherwise indicated - - - -Synopsis - - - -#include <libepc/service-info.h> - - EpcServiceInfo; -EpcServiceInfo* epc_service_info_new (const gchar *type, - const gchar *host, - guint port, - const AvahiStringList *details); -EpcServiceInfo* epc_service_info_new_full (const gchar *type, - const gchar *host, - guint port, - const AvahiStringList *details, - const AvahiAddress *address, - const gchar *ifname); -EpcServiceInfo* epc_service_info_ref (EpcServiceInfo *info); -void epc_service_info_unref (EpcServiceInfo *info); - -const AvahiAddress* epc_service_info_get_address (const EpcServiceInfo *info); -EpcAddressFamily epc_service_info_get_address_family (const EpcServiceInfo *info); -const gchar* epc_service_info_get_detail (const EpcServiceInfo *info, - const gchar *name); -const gchar* epc_service_info_get_host (const EpcServiceInfo *info); -const gchar* epc_service_info_get_interface (const EpcServiceInfo *info); -guint epc_service_info_get_port (const EpcServiceInfo *info); -const gchar* epc_service_info_get_service_type (const EpcServiceInfo *info); - - - - - - - - - - - - -Description - -The EpcServiceInfo object describes DNS-SD services. - - - - - -Details - -EpcServiceInfo -EpcServiceInfotypedef struct _EpcServiceInfo EpcServiceInfo; - -Description of a network service. -See also: epc_service_monitor_new(). - - - -epc_service_info_new () -epc_service_info_newEpcServiceInfo* epc_service_info_new (const gchar *type, - const gchar *host, - guint port, - const AvahiStringList *details); - -Creates a new service description using the information provided. The -details list usually is retrieved from the TXT record the dynamic naming -system (DNS) provides for the service. When using Avahi's service chooser -aui_service_dialog_get_txt_data() can be used for getting a details list. -To create an ad-hoc list use avahi_string_list_new() and related functions. - - -type : - the DNS-SD service type - -host : - the DNS hostname - -port : - the TCP/IP port - -details : - list of key-value pairs, or NULL - -Returns : The newly created service description, or NULL on error. - - - -epc_service_info_new_full () -epc_service_info_new_fullEpcServiceInfo* epc_service_info_new_full (const gchar *type, - const gchar *host, - guint port, - const AvahiStringList *details, - const AvahiAddress *address, - const gchar *ifname); - -Creates a new service description using the information provided. The -details list usually is retrieved from the TXT record the dynamic naming -system (DNS) provides for the service. When using Avahi's service chooser -aui_service_dialog_get_txt_data() can be used for getting a details list. -To create an ad-hoc list use avahi_string_list_new() and related functions. - - -type : - the DNS-SD service type - -host : - the DNS hostname - -port : - the TCP/IP port - -details : - list of key-value pairs, or NULL - -address : - IP address of the service, or NULL - -ifname : - network interface for contacting the service, or NULL - -Returns : The newly created service description, or NULL on error. - - - -epc_service_info_ref () -epc_service_info_refEpcServiceInfo* epc_service_info_ref (EpcServiceInfo *info); - -Increases the reference count of info by one. -See also: epc_service_info_unref() - - -info : - a EpcServiceInfo - -Returns : The same info object. - - - -epc_service_info_unref () -epc_service_info_unrefvoid epc_service_info_unref (EpcServiceInfo *info); - -Decreases the reference count of info by one. When its reference count -drops to 0, the object is finalized (i.e. its memory is freed). - - -See also: epc_service_info_ref() - - -info : - a EpcServiceInfo - - - -epc_service_info_get_address () -epc_service_info_get_addressconst AvahiAddress* epc_service_info_get_address (const EpcServiceInfo *info); - -Retrieves the IP address for contacting the service, -or NULL when that information is not available. - - -info : - a EpcServiceInfo - -Returns : A IP address, or NULL. - - - -epc_service_info_get_address_family () -epc_service_info_get_address_familyEpcAddressFamily epc_service_info_get_address_family (const EpcServiceInfo *info); - -Retrieves the address family for contacting the service, -or EPC_ADDRESS_UNSPEC when that information is not available. - - -info : - a EpcServiceInfo - -Returns : A EpcAddressFamily. - - - -epc_service_info_get_detail () -epc_service_info_get_detailconst gchar* epc_service_info_get_detail (const EpcServiceInfo *info, - const gchar *name); - -Retrieves a detail stored in the service's TXT record. -Returns NULL when the requested information is not available. - - -info : - a EpcServiceInfo - -name : - the detail's name - -Returns : The requested service detail, or NULL. - - - -epc_service_info_get_host () -epc_service_info_get_hostconst gchar* epc_service_info_get_host (const EpcServiceInfo *info); - -Retrieves the DNS host name associated with info. - - -info : - a EpcServiceInfo - -Returns : A DNS host name. - - - -epc_service_info_get_interface () -epc_service_info_get_interfaceconst gchar* epc_service_info_get_interface (const EpcServiceInfo *info); - -Retrieves the name of the network interface which must be used for -contacting the service, or NULL when that information is not available. - - -info : - a EpcServiceInfo - -Returns : A network interface name, or NULL. - - - -epc_service_info_get_port () -epc_service_info_get_portguint epc_service_info_get_port (const EpcServiceInfo *info); - -Retrieves the TCP/IP port associated with info. - - -info : - a EpcServiceInfo - -Returns : A TCP/IP port. - - - -epc_service_info_get_service_type () -epc_service_info_get_service_typeconst gchar* epc_service_info_get_service_type (const EpcServiceInfo *info); - -Retrieves the DNS-SD service type associated with info. - - -info : - a EpcServiceInfo - -Returns : A DNS-SD service type. - - - - - - - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/service-monitor.xml libepc-0.4.2/docs/reference/libepc/xml/service-monitor.xml --- libepc-0.3.11/docs/reference/libepc/xml/service-monitor.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/service-monitor.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,347 +0,0 @@ - - - - - -EpcServiceMonitor -3 -LIBEPC-1.0 Library - - - -EpcServiceMonitor -find DNS-SD services - - -Stability Level -Unstable, unless otherwise indicated - - - -Synopsis - - - -#include <libepc/service-monitor.h> - - EpcServiceMonitorClass; - EpcServiceMonitorPrivate; - EpcServiceMonitor; -EpcServiceMonitor* epc_service_monitor_new (const gchar *application, - const gchar *domain, - EpcProtocol first_protocol, - ...); -EpcServiceMonitor* epc_service_monitor_new_for_types (const gchar *domain, - ...); -EpcServiceMonitor* epc_service_monitor_new_for_types_strv - (const gchar *domain, - gchar **types); -void epc_service_monitor_set_skip_our_own - (EpcServiceMonitor *monitor, - gboolean setting); -gboolean epc_service_monitor_get_skip_our_own - (EpcServiceMonitor *monitor); - - - - -Object Hierarchy - - GObject - +----EpcServiceMonitor - - - - - - - - -Properties - - "application" gchar* : Read / Write / Construct Only - "domain" gchar* : Read / Write / Construct Only - "service-types" GStrv* : Read / Write / Construct Only - "skip-our-own" gboolean : Read / Write / Construct - - - - -Signals - - "scanning-done" : Run First - "service-found" : Run First - "service-removed" : Run First - - - - - -Description - -The EpcServiceMonitor object provides an easy method for finding DNS-SD -services. It hides all the boring state and callback handling Avahi -requires, and just exposes three simple GObject signals: -"service-found", "service-removed" -and "scanning-done". - - - - Find an Easy-Publish service - - monitor = epc_service_monitor_new ("glom", NULL, EPC_PROTOCOL_UNKNOWN); - - g_signal_connect (monitor, "service-found", service_found_cb, self); - g_signal_connect (monitor, "service-removed", service_removed_cb, self); - - g_main_loop_run (loop); - - - - - - - -Details - -EpcServiceMonitorClass -EpcServiceMonitorClasstypedef struct { - void (*service_found) (EpcServiceMonitor *monitor, - const gchar *name, - EpcServiceInfo *info); - void (*service_removed) (EpcServiceMonitor *monitor, - const gchar *name, - const gchar *type); - void (*scanning_done) (EpcServiceMonitor *monitor, - const gchar *type); -} EpcServiceMonitorClass; - - -Virtual methods of the EpcServiceMonitor class. - - - -service_found () - virtual method of the "service-found" signal - - - -service_removed () - virtual method of the "service-removed" signal - - - -scanning_done () - virtual method of the "scanning-done" signal - - - - -EpcServiceMonitorPrivate -EpcServiceMonitorPrivatetypedef struct _EpcServiceMonitorPrivate EpcServiceMonitorPrivate; - -Private fields of the EpcServiceMonitor class. - - - -EpcServiceMonitor -EpcServiceMonitortypedef struct _EpcServiceMonitor EpcServiceMonitor; - -Public fields of the EpcServiceMonitor class. - - - -epc_service_monitor_new () -epc_service_monitor_newEpcServiceMonitor* epc_service_monitor_new (const gchar *application, - const gchar *domain, - EpcProtocol first_protocol, - ...); - -Creates a new service monitor watching the specified domain for a -certain application using one of the protocols listed. Passing NULL for -application lists all libepc based applications. Passing NULL for domain -monitors the local network. Passing an empty protocol list requests -monitoring of all service-types supported by the library (see -epc_service_type_list_supported()). - - -application : - name of the application to monitor, or NULL - -domain : - the DNS domain to monitor, or NULL - -first_protocol : - the first protocol to monitor - -... : - a list of additional protocols, terminated by EPC_PROTOCOL_UNKNOWN - -Returns : The newly created service monitor. - - - -epc_service_monitor_new_for_types () -epc_service_monitor_new_for_typesEpcServiceMonitor* epc_service_monitor_new_for_types (const gchar *domain, - ...); - -Creates a new service monitor watching the specified domain for the -service-types listed. Passing NULL for domain monitors the local network. -Passing an empty service list requests monitoring of all service-types -supported by the library (see epc_service_type_list_supported()). - - -See also: epc_service_monitor_new_for_types_strv() - - -domain : - the DNS domain to monitor, or NULL - -... : - a NULL terminated list of service types to monitor - -Returns : The newly created service monitor. - -Since 0.3.1 - -epc_service_monitor_new_for_types_strv () -epc_service_monitor_new_for_types_strvEpcServiceMonitor* epc_service_monitor_new_for_types_strv - (const gchar *domain, - gchar **types); - -Creates a new service monitor watching the specified domain for the -service-types listed. Passing NULL for domain monitors the local network. -Passing an empty service list requests monitoring of all service-types -supported by the library (see epc_service_type_list_supported()). - - -See also: epc_service_monitor_new_for_types() - - -domain : - the DNS domain to monitor, or NULL - -types : - a NULL terminated list of service types to monitor - -Returns : The newly created service monitor. - - - -epc_service_monitor_set_skip_our_own () -epc_service_monitor_set_skip_our_ownvoid epc_service_monitor_set_skip_our_own - (EpcServiceMonitor *monitor, - gboolean setting); - -Updates the "skip-our-own" property. - - -monitor : - a EpcServiceMonitor - -setting : - the new setting - - - -epc_service_monitor_get_skip_our_own () -epc_service_monitor_get_skip_our_owngboolean epc_service_monitor_get_skip_our_own - (EpcServiceMonitor *monitor); - -Queries the current value of the "skip-our-own" property. - - -monitor : - a EpcServiceMonitor - -Returns : The current value of the "skip-our-own" property - - - - - -Property Details -The <literal>"application"</literal> property -EpcServiceMonitor:application "application" gchar* : Read / Write / Construct Only -The application to monitor.Default value: NULL - -The <literal>"domain"</literal> property -EpcServiceMonitor:domain "domain" gchar* : Read / Write / Construct Only -The DNS domain to monitor.Default value: NULL - -The <literal>"service-types"</literal> property -EpcServiceMonitor:service-types "service-types" GStrv* : Read / Write / Construct Only -The DNS-SD services types to watch. -The <literal>"skip-our-own"</literal> property -EpcServiceMonitor:skip-our-own "skip-our-own" gboolean : Read / Write / Construct -Skip services of the current application.Default value: FALSE - - - - -Signal Details -The <literal>"scanning-done"</literal> signal -EpcServiceMonitor::scanning-donevoid user_function (EpcServiceMonitor *monitor, - gchar *type, - gpointer user_data) : Run First - -This signal is emitted when active scanning as finished and most certainly -no new services will be detected for some time. Can be used for instance -to hide an progress indicator. - - -monitor : - a EpcServiceMonitor - -type : - the service type watched - -user_data : -user data set when the signal handler was connected. -The <literal>"service-found"</literal> signal -EpcServiceMonitor::service-foundvoid user_function (EpcServiceMonitor *monitor, - gchar *name, - EpcServiceInfo *info, - gpointer user_data) : Run First - -This signal is emitted when a new service was found. - - -monitor : - a EpcServiceMonitor - -name : - name of the service removed - -info : - a description of the service found - -user_data : -user data set when the signal handler was connected. -The <literal>"service-removed"</literal> signal -EpcServiceMonitor::service-removedvoid user_function (EpcServiceMonitor *monitor, - gchar *name, - gchar *type, - gpointer user_data) : Run First - -This signal is emitted when a previously known service disappears. - - -monitor : - a EpcServiceMonitor - -name : - name of the service removed - -type : - the service type watched - -user_data : -user data set when the signal handler was connected. - - - - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/service-type.xml libepc-0.4.2/docs/reference/libepc/xml/service-type.xml --- libepc-0.3.11/docs/reference/libepc/xml/service-type.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/service-type.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,185 +0,0 @@ - - - - - -EpcServiceType -3 -LIBEPC-1.0 Library - - - -EpcServiceType -service type details - - -Stability Level -Unstable, unless otherwise indicated - - - -Synopsis - - - -#include <libepc/service-type.h> - -#define EPC_SERVICE_TYPE_HTTP -#define EPC_SERVICE_TYPE_HTTPS -const gchar* epc_service_type_get_base (const gchar *type); -EpcProtocol epc_service_type_get_protocol (const gchar *service_type); -gchar** epc_service_type_list_supported (const gchar *application); -gchar* epc_service_type_new (EpcProtocol protocol, - const gchar *application); - - - - - - - - - - - - -Description - -DNS-SD uses well-known services types to discover service providers. -The following macros describe the service types uses by this library. - - - - Find an Easy-Publish server - - dialog = aui_service_dialog_new ("Choose an Easy Publish Server", NULL, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, - NULL); - aui_service_dialog_set_browse_service_types (AUI_SERVICE_DIALOG (dialog), - EPC_SERVICE_TYPE_HTTPS, - EPC_SERVICE_TYPE_HTTP, - NULL); - - if (GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog))) - { - const gint port = aui_service_dialog_get_port (AUI_SERVICE_DIALOG (dialog)); - const gchar *host = aui_service_dialog_get_host_name (AUI_SERVICE_DIALOG (dialog)); - const gchar *type = aui_service_dialog_get_service_type (AUI_SERVICE_DIALOG (dialog)); - EpcProtocol protocol = epc_service_type_get_protocol (type); - ... - } - - - - - - - -Details - -EPC_SERVICE_TYPE_HTTP -EPC_SERVICE_TYPE_HTTP#define EPC_SERVICE_TYPE_HTTP "_easy-publish-http._tcp" - - -The well-known DNS-SD service type for EpcPublisher -servers providing unencrypted HTTP access. - - - -EPC_SERVICE_TYPE_HTTPS -EPC_SERVICE_TYPE_HTTPS#define EPC_SERVICE_TYPE_HTTPS "_easy-publish-https._tcp" - - -The well-known DNS-SD service type for EpcPublisher -servers providing encrypted HTTPS access. - - - -epc_service_type_get_base () -epc_service_type_get_baseconst gchar* epc_service_type_get_base (const gchar *type); - -Extracts the base service-type of a DNS-SD service-type. - - -DNS-SD service types may contain a sub service type, for instance the -service-type "_anon._sub._ftp._tcp" contains the base-type "_ftp._tcp" -and the sub-type "_anon". This function extracts extracts the base-type. -The service type is returned unmodifed if it doesn't contain a sub-type. - - -type : - a DNS-SD service-type - -Returns : The base-service-type. - - - -epc_service_type_get_protocol () -epc_service_type_get_protocolEpcProtocol epc_service_type_get_protocol (const gchar *service_type); - -Queries the EpcProtocol associated with a DNS-SD service type. -See EPC_SERVICE_TYPE_HTTP, EPC_SERVICE_TYPE_HTTPS. - - -service_type : - a DNS-SD service type - -Returns : Returns the EpcProtocol associated with service_type, -or EPC_PROTOCOL_UNKNOWN for unrecognized or unsupported service types. - - - -epc_service_type_list_supported () -epc_service_type_list_supportedgchar** epc_service_type_list_supported (const gchar *application); - -Lists all service types supported by the library. When application is NULL -just the generic types, otherwise the service-subtypes for that application -are returned. The returned list is terminated by NULL and must be released -by the caller with g_strfreev(). - - -See also: epc_service_type_new(). - - -application : - an application name, or NULL - -Returns : The NULL terminated list of all supported service types. - - - -epc_service_type_new () -epc_service_type_newgchar* epc_service_type_new (EpcProtocol protocol, - const gchar *application); - -Builds the DNS-SD service type for the given transport protocol and -application. When application is NULL, the application name is retrieved by -calling g_get_prgname(). NULL is returned in that case if g_get_prgname() returns NULL. - - -The string returned should be released when no longer needed. - - -protocol : - a EpcProtocol - -application : - the application name, or NULL - -Returns : A newly allocated string holding the requested service-type, -or NULL when application is NULL and g_get_prgname() fails. - - - - - - - - -See Also -#EpcConsumer, EpcPublisher - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/shell.xml libepc-0.4.2/docs/reference/libepc/xml/shell.xml --- libepc-0.3.11/docs/reference/libepc/xml/shell.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/shell.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,389 +0,0 @@ - - - - - -EpcShell -3 -LIBEPC-1.0 Library - - - -EpcShell -library management functions - - -Stability Level -Private, unless otherwise indicated - - - -Synopsis - - - -#include <libepc/shell.h> - -#define EPC_DEBUG_LEVEL (level) -guint epc_shell_get_debug_level (void); - - EpcShellProgressHooks; -void epc_shell_progress_begin (const gchar *title, - const gchar *message); -void epc_shell_progress_end (void); -void epc_shell_progress_update (gdouble percentage, - const gchar *message); -void epc_shell_set_progress_hooks (const EpcShellProgressHooks *hooks, - gpointer user_data, - GDestroyNotify destroy_data); - -#define EPC_AVAHI_ERROR -guint epc_shell_watch_avahi_client_state (AvahiClientCallback callback, - gpointer user_data, - GDestroyNotify destroy_data, - GError **error); -AvahiEntryGroup* epc_shell_create_avahi_entry_group (AvahiEntryGroupCallback callback, - gpointer user_data); -AvahiServiceBrowser* epc_shell_create_service_browser (AvahiIfIndex interface, - AvahiProtocol protocol, - const gchar *type, - const gchar *domain, - AvahiLookupFlags flags, - AvahiServiceBrowserCallback callback, - gpointer user_data, - GError **error); -void epc_shell_restart_avahi_client (const gchar *strloc); -const gchar* epc_shell_get_host_name (GError **error); -void epc_shell_watch_remove (guint id); - - - - - - - - - - - - -Description - -The methods of the EpcShell singleton are used to manage library resources. - - - - - -Details - -EPC_DEBUG_LEVEL() -EPC_DEBUG_LEVEL#define EPC_DEBUG_LEVEL(level) G_UNLIKELY(epc_shell_get_debug_level () >= (level)) - - -Checks if the library's debug level, which can be modified by setting the -EPC_DEBUG environment variable, is above the value -sepecified by level. - - -level : - the minimum level to check for - - - -epc_shell_get_debug_level () -epc_shell_get_debug_levelguint epc_shell_get_debug_level (void); - -Query the library's debug level. The debug level can be modified by setting -the external EPC_DEBUG environment variable. In most -cases the EPC_DEBUG_LEVEL macro should be used, instead of calling this -checking the return value of this function. - - -Returns : The library's current debugging level. - - - -EpcShellProgressHooks -EpcShellProgressHookstypedef struct { - void (*begin) (const gchar *title, - gpointer user_data); - void (*update) (gdouble percentage, - const gchar *message, - gpointer user_data); - void (*end) (gpointer user_data); -} EpcShellProgressHooks; - - -This table is used by epc_shell_set_progress_hooks to install functions -allowing the library to provide feedback during processing. - - -See also: epc_progress_window_install - - - -begin () - the function called by epc_shell_progress_begin - - - -update () - the function called by epc_shell_progress_update - - - -end () - the function called by epc_shell_progress_end - - - - -epc_shell_progress_begin () -epc_shell_progress_beginvoid epc_shell_progress_begin (const gchar *title, - const gchar *message); - -Call this function before starting a lengthy operation to allow the -application tp provide some visual feedback during the operation, -and to generally keep its UI responsive. - - -This function calls your "begin" hook with title -as argument and "update" with message. - - -See also: epc_shell_set_progress_hooks(), epc_progress_window_install, -epc_shell_progress_update(), epc_shell_progress_end - - -title : - the title of the lengthy operation - -message : - description of the lengthy operation - - - -epc_shell_progress_end () -epc_shell_progress_endvoid epc_shell_progress_end (void); - -Call this function when your lengthy operation has finished. - - -See also: epc_shell_set_progress_hooks(), epc_progress_window_install, -epc_shell_progress_begin(), epc_shell_progress_update - - - -epc_shell_progress_update () -epc_shell_progress_updatevoid epc_shell_progress_update (gdouble percentage, - const gchar *message); - -Called this function to inform about progress of a lengthy operation. -The progress is expressed as percentage in the range [0..1], or -1 if the -progress cannot be estimated. - - -See also: epc_shell_set_progress_hooks(), epc_progress_window_install, -epc_shell_progress_begin, epc_shell_progress_end() - - -percentage : - current progress of the operation, or -1 - -message : - a description of the current progress - - - -epc_shell_set_progress_hooks () -epc_shell_set_progress_hooksvoid epc_shell_set_progress_hooks (const EpcShellProgressHooks *hooks, - gpointer user_data, - GDestroyNotify destroy_data); - -Installs functions which are called during processing, such as generating -server keys. This allows the application to indicate progress and generally -keep its UI responsive. If no progress callbacks are provided, -or when NULL is passed for hooks, progress messages are written to the -console. - - -See also: EpcEntropyProgress - - -hooks : - the function table to install, or NULL - -user_data : - custom data which shall be passed to the start hook - -destroy_data : - function to call on user_data when the hooks are replaced - - - -EPC_AVAHI_ERROR -EPC_AVAHI_ERROR#define EPC_AVAHI_ERROR (epc_avahi_error_quark ()) - - -Error domain for Avahi operations. Errors in this -domain will be Avahi error codes. See GError -for information on error domains. - - - -epc_shell_watch_avahi_client_state () -epc_shell_watch_avahi_client_stateguint epc_shell_watch_avahi_client_state (AvahiClientCallback callback, - gpointer user_data, - GDestroyNotify destroy_data, - GError **error); - -Registers a function to watch state changes of the library's AvahiClient. -On success the identifier of the newly created watch is returned. Pass it -to epc_shell_watch_remove() to remove the watch. On failure it returns 0 and -sets error. The error domain is EPC_AVAHI_ERROR. Possible error codes are -those of the Avahi library. - - - - Usually there is no need in handling the AVAHI_CLIENT_FAILURE state - for callback, as the callback dispatcher takes care already. This - state is dispatched mostly for notification purposes. - - - -callback : - a callback function - -user_data : - data to pass to callback - -destroy_data : - a function for freeing user_data when removing the watch - -error : - return location for a GError, or NULL - -Returns : The identifier of the newly created watch, or 0 on error. - - - -epc_shell_create_avahi_entry_group () -epc_shell_create_avahi_entry_groupAvahiEntryGroup* epc_shell_create_avahi_entry_group (AvahiEntryGroupCallback callback, - gpointer user_data); - -Creates a new AvahiEntryGroup for the library's shared AvahiClient. -On success the newly created AvahiEntryGroup is returned, -and NULL on failure. - - -callback : - a callback function - -user_data : - data to pass to callback - -Returns : The newly created AvahiEntryGroup, or NULL on error. - - - -epc_shell_create_service_browser () -epc_shell_create_service_browserAvahiServiceBrowser* epc_shell_create_service_browser (AvahiIfIndex interface, - AvahiProtocol protocol, - const gchar *type, - const gchar *domain, - AvahiLookupFlags flags, - AvahiServiceBrowserCallback callback, - gpointer user_data, - GError **error); - -Creates a new AvahiServiceBrowser for the library's shared AvahiClient. -On success the newly created AvahiEntryGroup is returned. On failure -NULL is returned and error is set. The error domain is EPC_AVAHI_ERROR. -Possible error codes are those of the Avahi library. - - -interface : - the index of the network interface to watch - -protocol : - the protocol of the services to watch - -type : - the DNS-SD service type to watch - -domain : - the DNS domain to watch, or NULL - -flags : - flags for creating the service browser - -callback : - a callback function - -user_data : - data to pass to callback - -error : - return location for a GError, or NULL - -Returns : The newly created AvahiServiceBrowser, or NULL on error. - - - -epc_shell_restart_avahi_client () -epc_shell_restart_avahi_clientvoid epc_shell_restart_avahi_client (const gchar *strloc); - -Requests restart of the builtin Avahi client. Use this function to react on -critical failures (like AVAHI_ENTRY_GROUP_FAILURE) reported to your Avahi -callbacks. The strloc argument is used to prevent endless restart cycles. - - - - Do not call this function to react on AVAHI_CLIENT_FAILURE in a - AvahiClientCallback. The builtin callback dispatcher deals with - that situation. - - - -strloc : - code location of the callee (G_STRLOC) - - - -epc_shell_get_host_name () -epc_shell_get_host_nameconst gchar* epc_shell_get_host_name (GError **error); - -Retrieves the official host name of this machine. On failure the function -returns NULL and sets error. The error domain is EPC_AVAHI_ERROR. -Possible error codes are those of the Avahi library. - - -error : - return location for a GError, or NULL - -Returns : The official host name, or NULL on error. - - - -epc_shell_watch_remove () -epc_shell_watch_removevoid epc_shell_watch_remove (guint id); - -Removes the watching callback identified by id. - - -See also: epc_shell_watch_avahi_client() - - -id : - identifier of an watching callback - - - - - - - - - diff -Nru libepc-0.3.11/docs/reference/libepc/xml/tls.xml libepc-0.4.2/docs/reference/libepc/xml/tls.xml --- libepc-0.3.11/docs/reference/libepc/xml/tls.xml 2010-03-23 13:15:18.000000000 +0000 +++ libepc-0.4.2/docs/reference/libepc/xml/tls.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,348 +0,0 @@ - - - - - -EpcTls -3 -LIBEPC-1.0 Library - - - -EpcTls -TLS support - - -Stability Level -Private, unless otherwise indicated - - - -Synopsis - - - -#include <libepc/shell.h> - -#define EPC_TLS_ERROR -#define EPC_TLS_SECONDS_PER_DAY -#define EPC_TLS_SECONDS_PER_HOUR -#define EPC_TLS_SECONDS_PER_MINUTE - -gnutls_x509_crt_t epc_tls_certificate_load (const gchar *filename, - GError **error); -gnutls_x509_crt_t epc_tls_certificate_new (const gchar *hostname, - guint validity, - gnutls_x509_privkey_t key, - GError **error); -gboolean epc_tls_certificate_save (gnutls_x509_crt_t certificate, - const gchar *filename, - GError **error); - -gnutls_x509_privkey_t epc_tls_private_key_load (const gchar *filename, - GError **error); -gnutls_x509_privkey_t epc_tls_private_key_new (GError **error); -gboolean epc_tls_private_key_save (gnutls_x509_privkey_t key, - const gchar *filename, - GError **error); - -gchar* epc_tls_get_private_key_filename (const gchar *hostname); -gchar* epc_tls_get_certificate_filename (const gchar *hostname); -gboolean epc_tls_get_server_credentials (const gchar *hostname, - gchar **crtfile, - gchar **keyfile, - GError **error); - - - - - - - - - - - - -Description - -Functions for handling TLS (X.509) certificates and keys. - - - - - -Details - -EPC_TLS_ERROR -EPC_TLS_ERROR#define EPC_TLS_ERROR (epc_tls_error_quark ()) - - -Error domain for TLS operations. Errors in this domain will -be GNU TLS error codes. See GError -for information on error domains. - - - -EPC_TLS_SECONDS_PER_DAY -EPC_TLS_SECONDS_PER_DAY#define EPC_TLS_SECONDS_PER_DAY (24 * EPC_TLS_SECONDS_PER_HOUR) - - -The number of seconds per day. - - - -EPC_TLS_SECONDS_PER_HOUR -EPC_TLS_SECONDS_PER_HOUR#define EPC_TLS_SECONDS_PER_HOUR (60 * EPC_TLS_SECONDS_PER_MINUTE) - - -The number of seconds per hour. - - - -EPC_TLS_SECONDS_PER_MINUTE -EPC_TLS_SECONDS_PER_MINUTE#define EPC_TLS_SECONDS_PER_MINUTE (60) - - -The number of seconds per minute. - - - -epc_tls_certificate_load () -epc_tls_certificate_loadgnutls_x509_crt_t epc_tls_certificate_load (const gchar *filename, - GError **error); - -Reads a PEM encoded X.509 certificate. - - -If the call was successful, the newly created certificate object is -returned. This key can be used with functions of the GNU -TLS library. If the call was not successful, it returns NULL -and sets error. The error domain is EPC_TLS_ERROR. Error codes are taken -from the GNU TLS library. - - -filename : - name of a file to read the certificate from, in the GLib file name encoding - -error : - return location for a GError, or NULL - -Returns : The newly created certificate object, or NULL. - - - -epc_tls_certificate_new () -epc_tls_certificate_newgnutls_x509_crt_t epc_tls_certificate_new (const gchar *hostname, - guint validity, - gnutls_x509_privkey_t key, - GError **error); - -Creates a self signed X.509 certificate. The certificate will mention -hostname as common name and as DNS host name, and it will be valid -for validity days. - - -If the call was successful, the newly created certificate is returned. This -certificate can be used with functions of the GNU TLS -library. If the call was not successful, it returns NULL and sets error. -The error domain is EPC_TLS_ERROR. Error codes are taken from the -GNU TLS library. - - -hostname : - the name of the host that will use this certificate - -validity : - the number of days the certificate will remain valid - -key : - the private key for signing the certificate - -error : - return location for a GError, or NULL - -Returns : The newly created certificate object, or NULL. - - - -epc_tls_certificate_save () -epc_tls_certificate_savegboolean epc_tls_certificate_save (gnutls_x509_crt_t certificate, - const gchar *filename, - GError **error); - -Writes a PEM encoded X.509 certificate. - - -If the call was successful, it returns TRUE. If the call was not -successful, it returns FALSE and sets error. The error domain is -EPC_TLS_ERROR. Error codes are taken from the GNU -TLS library. - - -certificate : - a X.509 certificate - -filename : - name of a file to write the certificate to, in the GLib file name encoding - -error : - return location for a GError, or NULL - -Returns : TRUE on successful, FALSE if an error occurred - - - -epc_tls_private_key_load () -epc_tls_private_key_loadgnutls_x509_privkey_t epc_tls_private_key_load (const gchar *filename, - GError **error); - -Reads a PEM encoded private X.509 key. - - -If the call was successful, the newly created private key object is -returned. This key can be used with functions of the GNU -TLS library. If the call was not successful, it returns NULL -and sets error. The error domain is EPC_TLS_ERROR. Error codes are taken -from the GNU TLS library. - - -filename : - name of a file to read the key from, in the GLib file name encoding - -error : - return location for a GError, or NULL - -Returns : The newly created key object, or NULL. - - - -epc_tls_private_key_new () -epc_tls_private_key_newgnutls_x509_privkey_t epc_tls_private_key_new (GError **error); - -Creates a self private X.509 key. Generating secure keys needs quite -some time. Call epc_tls_set_private_key_hooks() to install hooks providing -some feedback to your users. Key generation takes place in a separate -background thread, whilst the calling thread waits in a GMainLoop. So -for instance the GTK+ widget system remains responsible during that -phase. - - -If the call was successful, the newly created key is returned. This -certificate can be used with functions of the GNU TLS -library. If the call was not successful, it returns NULL and sets error. -The error domain is EPC_TLS_ERROR. Error codes are taken from the -GNU TLS library. - - -See also: EpcEntropyProgress - - -error : - return location for a GError, or NULL - -Returns : The newly created private key object, or NULL. - - - -epc_tls_private_key_save () -epc_tls_private_key_savegboolean epc_tls_private_key_save (gnutls_x509_privkey_t key, - const gchar *filename, - GError **error); - -Writes a PEM encoded private X.509 key. - - -If the call was successful, it returns TRUE. If the call was not -successful, it returns FALSE and sets error. The error domain is -EPC_TLS_ERROR. Error codes are taken from the GNU -TLS library. - - -key : - a private X.509 key - -filename : - name of a file to write the private key to, in the GLib file name encoding - -error : - return location for a GError, or NULL - -Returns : TRUE on successful, FALSE if an error occured - - - -epc_tls_get_private_key_filename () -epc_tls_get_private_key_filenamegchar* epc_tls_get_private_key_filename (const gchar *hostname); - -Queries the preferred location for storing private X.509 keys for the server -identified by hostname. This file is located in the current user's XDG -configuration folder (g_get_user_config_dir()). The filename also contains -program's name when specified by g_set_prgname(). - - -hostname : - the server's host name - -Returns : The preferred private key location for hostname. - - - -epc_tls_get_certificate_filename () -epc_tls_get_certificate_filenamegchar* epc_tls_get_certificate_filename (const gchar *hostname); - -Queries the preferred location for storing X.509 certificates for the server -identified by hostname. This file is located in the current user's XDG -configuration folder (g_get_user_config_dir()). The filename also contains -program's name when specified by g_set_prgname(). - - -hostname : - the server's host name - -Returns : The preferred certificate location for hostname. - - - -epc_tls_get_server_credentials () -epc_tls_get_server_credentialsgboolean epc_tls_get_server_credentials (const gchar *hostname, - gchar **crtfile, - gchar **keyfile, - GError **error); - -Searches or creates X.509 certificate and key for the server identified -by hostname. This function uses epc_tls_get_certificate_filename() and -epc_tls_get_private_key_filename() to locate existing certificates and -keys. New certificates and keys are generated, when the files cannot -be found, or the existing files contain invalid or expired information. - - -If the call was successful, it returns TRUE. If the call was not -successful, it returns FALSE and sets error. The error domain is -EPC_TLS_ERROR. Error codes are taken from the GNU -TLS library. - - -hostname : - the server's host name - -crtfile : - location for storing the certificate's filename in GLib filename encoding - -keyfile : - location for storing the private key's filename in GLib filename encoding - -error : - return location for a GError, or NULL - -Returns : TRUE on successful, FALSE if an error occurred - - - - - - - - - diff -Nru libepc-0.3.11/examples/consumer-ui.c libepc-0.4.2/examples/consumer-ui.c --- libepc-0.3.11/examples/consumer-ui.c 2010-03-23 11:15:24.000000000 +0000 +++ libepc-0.4.2/examples/consumer-ui.c 2011-08-31 12:11:22.000000000 +0000 @@ -35,7 +35,7 @@ keys = g_list_sort (keys, (GCompareFunc) strcmp); for (iter = keys; iter; iter = iter->next) - gtk_combo_box_append_text (GTK_COMBO_BOX (keys_combo), iter->data); + gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (keys_combo), NULL, iter->data); gtk_combo_box_set_active (GTK_COMBO_BOX (keys_combo), 0); gtk_widget_set_sensitive (keys_combo, TRUE); @@ -71,7 +71,7 @@ /* retreive a the currently selected resource */ - key = gtk_combo_box_get_active_text (combo_box); + key = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combo_box)); if (key) value = epc_consumer_lookup (consumer, key, &length, &error); @@ -120,7 +120,7 @@ /* Setup the combo box listing keys. */ - keys_combo = gtk_combo_box_new_text (); + keys_combo = gtk_combo_box_text_new (); gtk_widget_set_sensitive (keys_combo, FALSE); g_signal_connect (keys_combo, "changed", @@ -165,11 +165,12 @@ /* Create the dialog widget. */ dialog = gtk_dialog_new_with_buttons ("Published Value", NULL, - GTK_DIALOG_NO_SEPARATOR, + (GtkDialogFlags)0, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 350); return dialog; diff -Nru libepc-0.3.11/examples/publisher-ui.c libepc-0.4.2/examples/publisher-ui.c --- libepc-0.3.11/examples/publisher-ui.c 2010-03-23 11:32:56.000000000 +0000 +++ libepc-0.4.2/examples/publisher-ui.c 2011-08-31 12:16:12.000000000 +0000 @@ -366,25 +366,6 @@ auto_save_id = g_timeout_add (5 * 1000, auto_save_cb, NULL); } -static void -url_hook (GtkAboutDialog *dialog, - const gchar *link, - gpointer data G_GNUC_UNUSED) -{ - gchar *args[] = { "xdg-open", (gchar*) link, NULL }; - GError *error = NULL; - - gdk_spawn_on_screen (gtk_widget_get_screen (GTK_WIDGET (dialog)), - NULL, args, NULL, G_SPAWN_SEARCH_PATH, - NULL, NULL, NULL, &error); - - if (error) - { - show_error (GTK_WIDGET (dialog), "Cannot follow link.", error); - g_error_free (error); - } -} - void about_button_clicked_cb (GtkWidget *widget) { @@ -799,7 +780,6 @@ g_set_application_name ("Easy Publisher Example"); gtk_init (&argc, &argv); - gtk_about_dialog_set_url_hook (url_hook, NULL, NULL); builder = gtk_builder_new (); load_ui (argv[0]); diff -Nru libepc-0.3.11/libepc/consumer.c libepc-0.4.2/libepc/consumer.c --- libepc-0.3.11/libepc/consumer.c 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/consumer.c 2011-06-15 09:57:33.000000000 +0000 @@ -19,6 +19,10 @@ * Mathias Hasselmann */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "libepc/consumer.h" #include "libepc/enums.h" @@ -824,7 +828,7 @@ * * Returns: The user name this consumer uses. */ -G_CONST_RETURN gchar* +const gchar* epc_consumer_get_username (EpcConsumer *self) { g_return_val_if_fail (EPC_IS_CONSUMER (self), NULL); @@ -840,7 +844,7 @@ * * Returns: The password this consumer uses. */ -G_CONST_RETURN gchar* +const gchar* epc_consumer_get_password (EpcConsumer *self) { g_return_val_if_fail (EPC_IS_CONSUMER (self), NULL); diff -Nru libepc-0.3.11/libepc/consumer.h libepc-0.4.2/libepc/consumer.h --- libepc-0.3.11/libepc/consumer.h 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/consumer.h 2011-06-15 09:57:33.000000000 +0000 @@ -98,8 +98,8 @@ const gchar *password); EpcProtocol epc_consumer_get_protocol (EpcConsumer *consumer); -G_CONST_RETURN gchar* epc_consumer_get_username (EpcConsumer *consumer); -G_CONST_RETURN gchar* epc_consumer_get_password (EpcConsumer *consumer); +const gchar* epc_consumer_get_username (EpcConsumer *consumer); +const gchar* epc_consumer_get_password (EpcConsumer *consumer); gboolean epc_consumer_resolve_publisher (EpcConsumer *consumer, guint timeout); diff -Nru libepc-0.3.11/libepc/contents.c libepc-0.4.2/libepc/contents.c --- libepc-0.3.11/libepc/contents.c 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/contents.c 2011-06-15 09:57:33.000000000 +0000 @@ -267,7 +267,7 @@ * * Returns: Returns the MIME type of the buffer. */ -G_CONST_RETURN gchar* +const gchar* epc_contents_get_mime_type (EpcContents *self) { g_return_val_if_fail (NULL != self, NULL); diff -Nru libepc-0.3.11/libepc/contents.h libepc-0.4.2/libepc/contents.h --- libepc-0.3.11/libepc/contents.h 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/contents.h 2011-06-15 09:57:33.000000000 +0000 @@ -69,7 +69,7 @@ void epc_contents_unref (EpcContents *contents); gboolean epc_contents_is_stream (EpcContents *contents); -G_CONST_RETURN gchar* epc_contents_get_mime_type (EpcContents *contents); +const gchar* epc_contents_get_mime_type (EpcContents *contents); gconstpointer epc_contents_get_data (EpcContents *contents, gsize *length); diff -Nru libepc-0.3.11/libepc/dispatcher.c libepc-0.4.2/libepc/dispatcher.c --- libepc-0.3.11/libepc/dispatcher.c 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/dispatcher.c 2011-06-15 09:57:33.000000000 +0000 @@ -1052,7 +1052,7 @@ * * Returns: The user friendly name of the service. */ -G_CONST_RETURN gchar* +const gchar* epc_dispatcher_get_name (EpcDispatcher *self) { g_return_val_if_fail (EPC_IS_DISPATCHER (self), NULL); @@ -1069,7 +1069,7 @@ * Returns: The unique identifier of the service, or %NULL on error. * Since: 0.3.1 */ -G_CONST_RETURN gchar* +const gchar* epc_dispatcher_get_cookie (EpcDispatcher *self) { g_return_val_if_fail (EPC_IS_DISPATCHER (self), NULL); diff -Nru libepc-0.3.11/libepc/dispatcher.h libepc-0.4.2/libepc/dispatcher.h --- libepc-0.3.11/libepc/dispatcher.h 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/dispatcher.h 2011-06-15 09:57:33.000000000 +0000 @@ -110,9 +110,9 @@ void epc_dispatcher_set_collision_handling (EpcDispatcher *dispatcher, EpcCollisionHandling method); -G_CONST_RETURN gchar* epc_dispatcher_get_name (EpcDispatcher *dispatcher); +const gchar* epc_dispatcher_get_name (EpcDispatcher *dispatcher); EpcCollisionHandling epc_dispatcher_get_collision_handling (EpcDispatcher *dispatcher); -G_CONST_RETURN gchar* epc_dispatcher_get_cookie (EpcDispatcher *dispatcher); +const gchar* epc_dispatcher_get_cookie (EpcDispatcher *dispatcher); G_END_DECLS diff -Nru libepc-0.3.11/libepc/enums.c libepc-0.4.2/libepc/enums.c --- libepc-0.3.11/libepc/enums.c 2010-03-23 13:08:27.000000000 +0000 +++ libepc-0.4.2/libepc/enums.c 2011-10-12 16:23:11.000000000 +0000 @@ -57,7 +57,7 @@ * * Returns: The string representation of @value, or %NULL. */ -G_CONST_RETURN gchar* +const gchar* epc_collision_handling_to_string (EpcCollisionHandling value) { const GEnumValue *enum_value = g_enum_get_value (epc_collision_handling_get_class (), value); @@ -122,7 +122,7 @@ * * Returns: The string representation of @value, or %NULL. */ -G_CONST_RETURN gchar* +const gchar* epc_protocol_to_string (EpcProtocol value) { const GEnumValue *enum_value = g_enum_get_value (epc_protocol_get_class (), value); @@ -186,7 +186,7 @@ * * Returns: The string representation of @value, or %NULL. */ -G_CONST_RETURN gchar* +const gchar* epc_auth_flags_to_string (EpcAuthFlags value) { const GFlagsValue *flags_value = g_flags_get_value (epc_auth_flags_get_class (), value); @@ -251,7 +251,7 @@ * * Returns: The string representation of @value, or %NULL. */ -G_CONST_RETURN gchar* +const gchar* epc_address_family_to_string (EpcAddressFamily value) { const GEnumValue *enum_value = g_enum_get_value (epc_address_family_get_class (), value); diff -Nru libepc-0.3.11/libepc/enums.c.in libepc-0.4.2/libepc/enums.c.in --- libepc-0.3.11/libepc/enums.c.in 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/enums.c.in 2011-09-30 11:38:11.000000000 +0000 @@ -65,7 +65,7 @@ * * Returns: The string representation of @value, or %NULL. */ -G_CONST_RETURN gchar* +const gchar* @enum_name@_to_string (@EnumName@ value) { const G@Type@Value *@type@_value = g_@type@_get_value (@enum_name@_get_class (), value); diff -Nru libepc-0.3.11/libepc/enums.h libepc-0.4.2/libepc/enums.h --- libepc-0.3.11/libepc/enums.h 2010-03-23 13:08:27.000000000 +0000 +++ libepc-0.4.2/libepc/enums.h 2011-10-12 16:23:11.000000000 +0000 @@ -15,7 +15,7 @@ GType epc_collision_handling_get_type (void) G_GNUC_CONST; GEnumClass* epc_collision_handling_get_class (void) G_GNUC_CONST; -G_CONST_RETURN gchar* epc_collision_handling_to_string (EpcCollisionHandling value) G_GNUC_PURE; +const gchar* epc_collision_handling_to_string (EpcCollisionHandling value) G_GNUC_PURE; /* Generated by glib-mkenums from "./libepc/protocol.h" */ #include "./libepc/protocol.h" @@ -23,7 +23,7 @@ GType epc_protocol_get_type (void) G_GNUC_CONST; GEnumClass* epc_protocol_get_class (void) G_GNUC_CONST; -G_CONST_RETURN gchar* epc_protocol_to_string (EpcProtocol value) G_GNUC_PURE; +const gchar* epc_protocol_to_string (EpcProtocol value) G_GNUC_PURE; /* Generated by glib-mkenums from "./libepc/publisher.h" */ #include "./libepc/publisher.h" @@ -31,7 +31,7 @@ GType epc_auth_flags_get_type (void) G_GNUC_CONST; GFlagsClass* epc_auth_flags_get_class (void) G_GNUC_CONST; -G_CONST_RETURN gchar* epc_auth_flags_to_string (EpcAuthFlags value) G_GNUC_PURE; +const gchar* epc_auth_flags_to_string (EpcAuthFlags value) G_GNUC_PURE; /* Generated by glib-mkenums from "./libepc/service-info.h" */ #include "./libepc/service-info.h" @@ -39,7 +39,7 @@ GType epc_address_family_get_type (void) G_GNUC_CONST; GEnumClass* epc_address_family_get_class (void) G_GNUC_CONST; -G_CONST_RETURN gchar* epc_address_family_to_string (EpcAddressFamily value) G_GNUC_PURE; +const gchar* epc_address_family_to_string (EpcAddressFamily value) G_GNUC_PURE; G_END_DECLS diff -Nru libepc-0.3.11/libepc/enums.h.in libepc-0.4.2/libepc/enums.h.in --- libepc-0.3.11/libepc/enums.h.in 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/enums.h.in 2011-09-30 11:38:11.000000000 +0000 @@ -19,7 +19,7 @@ GType @enum_name@_get_type (void) G_GNUC_CONST; G@Type@Class* @enum_name@_get_class (void) G_GNUC_CONST; -G_CONST_RETURN gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE; +const gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE; /*** END value-header ***/ /*** BEGIN file-tail ***/ diff -Nru libepc-0.3.11/libepc/marshal.c libepc-0.4.2/libepc/marshal.c --- libepc-0.3.11/libepc/marshal.c 2010-03-23 13:08:27.000000000 +0000 +++ libepc-0.4.2/libepc/marshal.c 2011-10-12 16:23:11.000000000 +0000 @@ -23,6 +23,7 @@ #define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) #define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) #define g_marshal_value_peek_object(v) g_value_get_object (v) +#define g_marshal_value_peek_variant(v) g_value_get_variant (v) #else /* !G_ENABLE_DEBUG */ /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. * Do not access GValues directly in your code. Instead, use the @@ -46,6 +47,7 @@ #define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer #define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer #define g_marshal_value_peek_object(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer #endif /* !G_ENABLE_DEBUG */ diff -Nru libepc-0.3.11/libepc/protocol.c libepc-0.4.2/libepc/protocol.c --- libepc-0.3.11/libepc/protocol.c 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/protocol.c 2011-06-15 09:57:33.000000000 +0000 @@ -118,7 +118,7 @@ * Returns: Returns the DNS-SD service type associated * with @protocol, or %NULL on unknown protocols. */ -G_CONST_RETURN gchar* +const gchar* epc_protocol_get_service_type (EpcProtocol protocol) { switch (protocol) @@ -146,7 +146,7 @@ * Returns: Returns the URI scheme associated with @protocol, * or %NULL on unknown protocols. */ -G_CONST_RETURN gchar* +const gchar* epc_protocol_get_uri_scheme (EpcProtocol protocol) { switch (protocol) diff -Nru libepc-0.3.11/libepc/protocol.h libepc-0.4.2/libepc/protocol.h --- libepc-0.3.11/libepc/protocol.h 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/protocol.h 2011-06-15 09:57:33.000000000 +0000 @@ -51,8 +51,8 @@ guint16 port, const gchar *path); -G_CONST_RETURN gchar* epc_protocol_get_service_type (EpcProtocol protocol) G_GNUC_CONST; -G_CONST_RETURN gchar* epc_protocol_get_uri_scheme (EpcProtocol protocol) G_GNUC_CONST; +const gchar* epc_protocol_get_service_type (EpcProtocol protocol) G_GNUC_CONST; +const gchar* epc_protocol_get_uri_scheme (EpcProtocol protocol) G_GNUC_CONST; G_END_DECLS diff -Nru libepc-0.3.11/libepc/publisher.c libepc-0.4.2/libepc/publisher.c --- libepc-0.3.11/libepc/publisher.c 2010-03-23 11:15:24.000000000 +0000 +++ libepc-0.4.2/libepc/publisher.c 2011-06-15 09:57:33.000000000 +0000 @@ -19,6 +19,10 @@ * Mathias Hasselmann */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "libepc/publisher.h" #include "libepc/dispatcher.h" #include "libepc/enums.h" @@ -343,7 +347,7 @@ return contents; } -static G_CONST_RETURN gchar* +static const gchar* epc_publisher_get_key (const gchar *path) { const gchar *key; @@ -1042,7 +1046,7 @@ return (NULL != self->priv->server); } -static G_CONST_RETURN gchar* +static const gchar* epc_publisher_compute_name (EpcPublisher *self) { const gchar *name = self->priv->service_name; @@ -2258,7 +2262,7 @@ * * Returns: The human friendly name of this #EpcPublisher. */ -G_CONST_RETURN gchar* +const gchar* epc_publisher_get_service_name (EpcPublisher *self) { g_return_val_if_fail (EPC_IS_PUBLISHER (self), NULL); @@ -2274,7 +2278,7 @@ * * Returns: The DNS-SD domain of this #EpcPublisher, or %NULL. */ -G_CONST_RETURN gchar* +const gchar* epc_publisher_get_service_domain (EpcPublisher *self) { g_return_val_if_fail (EPC_IS_PUBLISHER (self), NULL); @@ -2290,7 +2294,7 @@ * * Returns: The certificate's file name, or %NULL. */ -G_CONST_RETURN gchar* +const gchar* epc_publisher_get_certificate_file (EpcPublisher *self) { g_return_val_if_fail (EPC_IS_PUBLISHER (self), NULL); @@ -2306,7 +2310,7 @@ * * Returns: The private key's file name, or %NULL. */ -G_CONST_RETURN gchar* +const gchar* epc_publisher_get_private_key_file (EpcPublisher *self) { g_return_val_if_fail (EPC_IS_PUBLISHER (self), NULL); @@ -2339,7 +2343,7 @@ * * Returns: The server's contents path. */ -G_CONST_RETURN gchar* +const gchar* epc_publisher_get_contents_path (EpcPublisher *self) { g_return_val_if_fail (EPC_IS_PUBLISHER (self), NULL); @@ -2373,7 +2377,7 @@ * Returns: The unique identifier of the service, or %NULL on error. * Since: 0.3.1 */ -G_CONST_RETURN gchar* +const gchar* epc_publisher_get_service_cookie (EpcPublisher *self) { g_return_val_if_fail (EPC_IS_PUBLISHER (self), NULL); @@ -2727,7 +2731,7 @@ * * Returns: The resource key. */ -G_CONST_RETURN gchar* +const gchar* epc_auth_context_get_key (const EpcAuthContext *context) { g_return_val_if_fail (NULL != context, NULL); @@ -2745,7 +2749,7 @@ * * Returns: The password sent, or %NULL. */ -G_CONST_RETURN gchar* +const gchar* epc_auth_context_get_password (const EpcAuthContext *context) { g_return_val_if_fail (NULL != context, NULL); diff -Nru libepc-0.3.11/libepc/publisher.h libepc-0.4.2/libepc/publisher.h --- libepc-0.3.11/libepc/publisher.h 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/publisher.h 2011-06-15 09:57:33.000000000 +0000 @@ -156,15 +156,15 @@ void epc_publisher_set_service_cookie (EpcPublisher *publisher, const gchar *cookie); -G_CONST_RETURN gchar* epc_publisher_get_service_name (EpcPublisher *publisher); -G_CONST_RETURN gchar* epc_publisher_get_service_domain (EpcPublisher *publisher); -G_CONST_RETURN gchar* epc_publisher_get_certificate_file (EpcPublisher *publisher); -G_CONST_RETURN gchar* epc_publisher_get_private_key_file (EpcPublisher *publisher); +const gchar* epc_publisher_get_service_name (EpcPublisher *publisher); +const gchar* epc_publisher_get_service_domain (EpcPublisher *publisher); +const gchar* epc_publisher_get_certificate_file (EpcPublisher *publisher); +const gchar* epc_publisher_get_private_key_file (EpcPublisher *publisher); EpcProtocol epc_publisher_get_protocol (EpcPublisher *publisher); -G_CONST_RETURN gchar* epc_publisher_get_contents_path (EpcPublisher *publisher); +const gchar* epc_publisher_get_contents_path (EpcPublisher *publisher); EpcAuthFlags epc_publisher_get_auth_flags (EpcPublisher *publisher); EpcCollisionHandling epc_publisher_get_collision_handling (EpcPublisher *publisher); -G_CONST_RETURN gchar* epc_publisher_get_service_cookie (EpcPublisher *publisher); +const gchar* epc_publisher_get_service_cookie (EpcPublisher *publisher); void epc_publisher_add (EpcPublisher *publisher, const gchar *key, @@ -214,8 +214,8 @@ GError **error); EpcPublisher* epc_auth_context_get_publisher (const EpcAuthContext *context); -G_CONST_RETURN gchar* epc_auth_context_get_key (const EpcAuthContext *context); -G_CONST_RETURN gchar* epc_auth_context_get_password (const EpcAuthContext *context); +const gchar* epc_auth_context_get_key (const EpcAuthContext *context); +const gchar* epc_auth_context_get_password (const EpcAuthContext *context); gboolean epc_auth_context_check_password (const EpcAuthContext *context, const gchar *password); diff -Nru libepc-0.3.11/libepc/service-info.c libepc-0.4.2/libepc/service-info.c --- libepc-0.3.11/libepc/service-info.c 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/service-info.c 2011-06-15 09:57:33.000000000 +0000 @@ -191,7 +191,7 @@ * * Returns: A DNS-SD service type. */ -G_CONST_RETURN gchar* +const gchar* epc_service_info_get_service_type (const EpcServiceInfo *self) { g_return_val_if_fail (NULL != self, NULL); @@ -206,7 +206,7 @@ * * Returns: A DNS host name. */ -G_CONST_RETURN gchar* +const gchar* epc_service_info_get_host (const EpcServiceInfo *self) { g_return_val_if_fail (NULL != self, NULL); @@ -238,7 +238,7 @@ * * Returns: The requested service detail, or %NULL. */ -G_CONST_RETURN gchar* +const gchar* epc_service_info_get_detail (const EpcServiceInfo *self, const gchar *name) { @@ -273,7 +273,7 @@ * * Returns: A network interface name, or %NULL. */ -G_CONST_RETURN gchar* +const gchar* epc_service_info_get_interface (const EpcServiceInfo *self) { g_return_val_if_fail (NULL != self, NULL); @@ -309,7 +309,7 @@ * * Returns: A IP address, or %NULL. */ -G_CONST_RETURN AvahiAddress* +const AvahiAddress* epc_service_info_get_address (const EpcServiceInfo *self) { g_return_val_if_fail (NULL != self, NULL); diff -Nru libepc-0.3.11/libepc/service-info.h libepc-0.4.2/libepc/service-info.h --- libepc-0.3.11/libepc/service-info.h 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/service-info.h 2011-06-15 09:57:33.000000000 +0000 @@ -66,15 +66,15 @@ EpcServiceInfo* epc_service_info_ref (EpcServiceInfo *info); void epc_service_info_unref (EpcServiceInfo *info); -G_CONST_RETURN gchar* epc_service_info_get_service_type (const EpcServiceInfo *info); -G_CONST_RETURN gchar* epc_service_info_get_host (const EpcServiceInfo *info); +const gchar* epc_service_info_get_service_type (const EpcServiceInfo *info); +const gchar* epc_service_info_get_host (const EpcServiceInfo *info); guint epc_service_info_get_port (const EpcServiceInfo *info); -G_CONST_RETURN gchar* epc_service_info_get_detail (const EpcServiceInfo *info, +const gchar* epc_service_info_get_detail (const EpcServiceInfo *info, const gchar *name); -G_CONST_RETURN gchar* epc_service_info_get_interface (const EpcServiceInfo *info); +const gchar* epc_service_info_get_interface (const EpcServiceInfo *info); EpcAddressFamily epc_service_info_get_address_family (const EpcServiceInfo *info); -G_CONST_RETURN AvahiAddress* epc_service_info_get_address (const EpcServiceInfo *info); +const AvahiAddress* epc_service_info_get_address (const EpcServiceInfo *info); G_END_DECLS diff -Nru libepc-0.3.11/libepc/service-type.c libepc-0.4.2/libepc/service-type.c --- libepc-0.3.11/libepc/service-type.c 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/service-type.c 2011-06-15 09:57:33.000000000 +0000 @@ -149,7 +149,7 @@ * * Returns: The base-service-type. */ -G_CONST_RETURN gchar* +const gchar* epc_service_type_get_base (const gchar *type) { const gchar *base; diff -Nru libepc-0.3.11/libepc/service-type.h libepc-0.4.2/libepc/service-type.h --- libepc-0.3.11/libepc/service-type.h 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/service-type.h 2011-06-15 09:57:33.000000000 +0000 @@ -43,7 +43,7 @@ gchar* epc_service_type_new (EpcProtocol protocol, const gchar *application); -G_CONST_RETURN gchar* epc_service_type_get_base (const gchar *type) G_GNUC_PURE; +const gchar* epc_service_type_get_base (const gchar *type) G_GNUC_PURE; EpcProtocol epc_service_type_get_protocol (const gchar *service_type) G_GNUC_PURE; gchar** epc_service_type_list_supported (const gchar *application); diff -Nru libepc-0.3.11/libepc/shell.c libepc-0.4.2/libepc/shell.c --- libepc-0.3.11/libepc/shell.c 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/shell.c 2011-06-15 09:57:33.000000000 +0000 @@ -18,6 +18,11 @@ * Authors: * Mathias Hasselmann */ + +#ifdef HAVE_CONFIG_H +#include +#endif + #include "libepc/shell.h" #include @@ -428,7 +433,7 @@ * * Returns: The official host name, or %NULL on error. */ -G_CONST_RETURN gchar* +const gchar* epc_shell_get_host_name (GError **error) { AvahiClient *client = epc_shell_get_avahi_client (error); diff -Nru libepc-0.3.11/libepc/shell.h libepc-0.4.2/libepc/shell.h --- libepc-0.3.11/libepc/shell.h 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc/shell.h 2011-06-15 09:57:33.000000000 +0000 @@ -101,7 +101,7 @@ GError **error); void epc_shell_restart_avahi_client (const gchar *strloc); -G_CONST_RETURN gchar* epc_shell_get_host_name (GError **error); +const gchar* epc_shell_get_host_name (GError **error); void epc_shell_set_progress_hooks (const EpcShellProgressHooks *hooks, gpointer user_data, diff -Nru libepc-0.3.11/libepc/tls.c libepc-0.4.2/libepc/tls.c --- libepc-0.3.11/libepc/tls.c 2010-03-23 11:15:24.000000000 +0000 +++ libepc-0.4.2/libepc/tls.c 2011-03-29 08:53:50.000000000 +0000 @@ -18,6 +18,11 @@ * Authors: * Mathias Hasselmann */ + +#ifdef HAVE_CONFIG_H +#include +#endif + #include "libepc/tls.h" #include "libepc/shell.h" diff -Nru libepc-0.3.11/libepc-ui/password-dialog.c libepc-0.4.2/libepc-ui/password-dialog.c --- libepc-0.3.11/libepc-ui/password-dialog.c 2010-03-23 11:07:57.000000000 +0000 +++ libepc-0.4.2/libepc-ui/password-dialog.c 2011-06-15 09:57:33.000000000 +0000 @@ -19,6 +19,10 @@ * Mathias Hasselmann */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "password-dialog.h" #include @@ -155,7 +159,12 @@ gtk_widget_show_all (table); +#if GTK_CHECK_VERSION (2, 14, 0) + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), + table, TRUE, TRUE, 0); +#else gtk_box_pack_start (GTK_BOX (GTK_DIALOG (self)->vbox), table, TRUE, TRUE, 0); +#endif } static void @@ -404,7 +413,7 @@ epc_password_dialog_get_anonymous_allowed (EpcPasswordDialog *self) { g_return_val_if_fail (EPC_IS_PASSWORD_DIALOG (self), FALSE); -#if GTK_CHECK_VERSION (2, 19, 7) +#if GTK_CHECK_VERSION (2, 19, 7) || GTK_CHECK_VERSION (2, 14, 0) && GSEAL_ENABLE return gtk_widget_get_visible (self->priv->anonymous); #else return GTK_WIDGET_VISIBLE (self->priv->anonymous); @@ -473,7 +482,7 @@ * * Returns: the current user name of the dialog. */ -G_CONST_RETURN gchar* +const gchar* epc_password_dialog_get_username (EpcPasswordDialog *self) { g_return_val_if_fail (EPC_IS_PASSWORD_DIALOG (self), NULL); @@ -509,7 +518,7 @@ * * Returns: the current password of the dialog. */ -G_CONST_RETURN gchar* +const gchar* epc_password_dialog_get_password (EpcPasswordDialog *self) { g_return_val_if_fail (EPC_IS_PASSWORD_DIALOG (self), NULL); @@ -545,7 +554,7 @@ * * Returns: the current realm of the dialog. */ -G_CONST_RETURN gchar* +const gchar* epc_password_dialog_get_realm (EpcPasswordDialog *self) { g_return_val_if_fail (EPC_IS_PASSWORD_DIALOG (self), NULL); diff -Nru libepc-0.3.11/libepc-ui/password-dialog.h libepc-0.4.2/libepc-ui/password-dialog.h --- libepc-0.3.11/libepc-ui/password-dialog.h 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc-ui/password-dialog.h 2011-06-15 09:57:33.000000000 +0000 @@ -81,15 +81,15 @@ void epc_password_dialog_set_username (EpcPasswordDialog *dialog, const gchar *username); -G_CONST_RETURN gchar* epc_password_dialog_get_username (EpcPasswordDialog *dialog); +const gchar* epc_password_dialog_get_username (EpcPasswordDialog *dialog); void epc_password_dialog_set_password (EpcPasswordDialog *dialog, const gchar *password); -G_CONST_RETURN gchar* epc_password_dialog_get_password (EpcPasswordDialog *dialog); +const gchar* epc_password_dialog_get_password (EpcPasswordDialog *dialog); void epc_password_dialog_set_realm (EpcPasswordDialog *dialog, const gchar *realm); -G_CONST_RETURN gchar* epc_password_dialog_get_realm (EpcPasswordDialog *dialog); +const gchar* epc_password_dialog_get_realm (EpcPasswordDialog *dialog); void epc_password_dialog_attach (EpcPasswordDialog *dialog, EpcConsumer *consumer); diff -Nru libepc-0.3.11/libepc-ui/progress-window.c libepc-0.4.2/libepc-ui/progress-window.c --- libepc-0.3.11/libepc-ui/progress-window.c 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/libepc-ui/progress-window.c 2011-06-15 09:57:15.000000000 +0000 @@ -118,7 +118,7 @@ epc_progress_window_realize (GtkWidget *widget) { GTK_WIDGET_CLASS (epc_progress_window_parent_class)->realize (widget); - gdk_window_set_decorations (widget->window, GDK_DECOR_BORDER); + gdk_window_set_decorations (gtk_widget_get_window (widget), GDK_DECOR_BORDER); } static void diff -Nru libepc-0.3.11/ltmain.sh libepc-0.4.2/ltmain.sh --- libepc-0.3.11/ltmain.sh 2010-03-23 13:08:15.000000000 +0000 +++ libepc-0.4.2/ltmain.sh 2011-10-13 14:51:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6b +# libtool (GNU libtool) 2.4 # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -32,50 +32,56 @@ # # Provide generalized library-building support services. # -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print informational messages (default) -# --version print version information -# -h, --help print short or long help message +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages +# --version print version information +# -h, --help, --help-all print short, long, or detailed help message # # MODE must be one of the following: # -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory # -# MODE-ARGS vary depending on the MODE. +# MODE-ARGS vary depending on the MODE. When passed as first option, +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. # Try `$progname --help --mode=MODE' for a more detailed description of MODE. # # When reporting a bug, please describe a test case to reproduce it and # include the following information: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6b -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . -PROGRAM=ltmain.sh +PROGRAM=libtool PACKAGE=libtool -VERSION=2.2.6b +VERSION="2.4 Debian-2.4-2ubuntu1" TIMESTAMP="" -package_revision=1.3017 +package_revision=1.3293 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -91,10 +97,15 @@ BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + # NLS nuisances: We save the old values to restore during execute mode. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -107,15 +118,24 @@ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL $lt_unset CDPATH +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" : ${CP="cp -f"} -: ${ECHO="echo"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} : ${EGREP="/bin/grep -E"} : ${FGREP="/bin/grep -F"} : ${GREP="/bin/grep"} @@ -144,6 +164,27 @@ dirname="s,/[^/]*$,," basename="s,^.*/,," +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -158,33 +199,183 @@ # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation + + +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' + +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result } -# Generated shell functions inserted here. +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi + + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} # The name of this program: -# In the unlikely event $progname began with a '-', it would play havoc with -# func_echo (imagine progname=-n), so we prepend ./ in that case: func_dirname_and_basename "$progpath" progname=$func_basename_result -case $progname in - -*) progname=./$progname ;; -esac # Make sure we have an absolute path for reexecution: case $progpath in @@ -215,6 +406,15 @@ # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' + +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -243,7 +443,7 @@ # name if it has been set yet. func_echo () { - $ECHO "$progname${mode+: }$mode: $*" + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" } # func_verbose arg... @@ -258,18 +458,25 @@ : } +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + # func_error arg... # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -326,9 +533,9 @@ case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` done - my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -378,7 +585,7 @@ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "X$my_tmpdir" | $Xsed + $ECHO "$my_tmpdir" } @@ -392,7 +599,7 @@ { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -419,7 +626,7 @@ { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "X$1" | $Xsed \ + my_arg=`$ECHO "$1" | $SED \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -488,15 +695,39 @@ fi } - - +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} # func_version # Echo version message to standard output and exit. func_version () { - $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { + $opt_debug + + $SED -n '/(C)/!b go + :more + /\./!{ + N + s/\n# / / + b more + } + :go + /^# '$PROGRAM' (GNU /,/# warranty; / { s/^# // s/^# *$// s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ @@ -509,22 +740,28 @@ # Echo short help message to standard output and exit. func_usage () { - $SED -n '/^# Usage:/,/# -h/ { + $opt_debug + + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - $ECHO + echo $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help -# Echo long help message to standard output and exit. +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. func_help () { + $opt_debug + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -537,8 +774,15 @@ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ p - }' < "$progpath" - exit $? + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret + fi } # func_missing_arg argname @@ -546,63 +790,106 @@ # exit_cmd. func_missing_arg () { - func_error "missing argument for $1" + $opt_debug + + func_error "missing argument for $1." exit_cmd=exit } -exit_cmd=: +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation + + +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation +exit_cmd=: -# Check that we have a working $ECHO. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell, and then maybe $ECHO will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -636,16 +923,16 @@ # Display the features supported by this script. func_features () { - $ECHO "host: $host" + echo "host: $host" if test "$build_libtool_libs" = yes; then - $ECHO "enable shared libraries" + echo "enable shared libraries" else - $ECHO "disable shared libraries" + echo "disable shared libraries" fi if test "$build_old_libs" = yes; then - $ECHO "enable static libraries" + echo "enable static libraries" else - $ECHO "disable static libraries" + echo "disable static libraries" fi exit $? @@ -692,117 +979,204 @@ esac } -# Parse options once, thoroughly. This comes as soon as possible in -# the script to make things like `libtool --version' happen quickly. +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () { + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi - # Shorthand for --mode=foo, only valid as the first argument - case $1 in - clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; - compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; - execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; - finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; - install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; - link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac + exit $EXIT_MISMATCH + fi +} - # Parse non-mode specific arguments: - while test "$#" -gt 0; do + +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac + + + +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_verbose=: +opt_silent=false +opt_verbose=false + + +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ + # this just eases exit handling + while test $# -gt 0; do opt="$1" shift - case $opt in - --config) func_config ;; - - --debug) preserve_args="$preserve_args $opt" + --debug|-x) opt_debug='set -x' func_echo "enabling shell trace mode" - opt_debug='set -x' $opt_debug ;; - - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break - execute_dlfiles="$execute_dlfiles $1" - shift + --dry-run|--dryrun|-n) + opt_dry_run=: ;; - - --dry-run | -n) opt_dry_run=: ;; - --features) func_features ;; - --finish) mode="finish" ;; - - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break - case $1 in - # Valid mode arguments: - clean) ;; - compile) ;; - execute) ;; - finish) ;; - install) ;; - link) ;; - relink) ;; - uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; - esac - - mode="$1" + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" shift ;; - --preserve-dup-deps) - opt_duplicate_deps=: ;; - - --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: + opt_preserve_dup_deps=: ;; - - --verbose| -v) preserve_args="$preserve_args $opt" + --features) + opt_features=: +func_features + ;; + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) opt_silent=false +func_append preserve_args " $opt" ;; - - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break - preserve_args="$preserve_args $opt $1" - func_enable_tag "$1" # tagname is set here + --no-verbose) + opt_verbose=false +func_append preserve_args " $opt" + ;; + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" shift ;; + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; + # Separate optargs to long options: - -dlopen=*|--mode=*|--tag=*) - func_opt_split "$opt" - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} shift ;; - -\?|-h) func_usage ;; - --help) opt_help=: ;; - --version) func_version ;; - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - - *) nonopt="$opt" - break + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift ;; + + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; esac done + # Validate options: + + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi + + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -810,82 +1184,44 @@ opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps ;; esac - # Having warned about all mis-specified options, bail out if - # anything was wrong. - $exit_cmd $EXIT_FAILURE -} + $opt_help || { + # Sanity checks first: + func_check_version_match -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi - exit $EXIT_MISMATCH - fi -} - - -## ----------- ## -## Main. ## -## ----------- ## + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" -$opt_help || { - # Sanity checks first: - func_check_version_match + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } - test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$mode' for more information." -} +## ----------- ## +## Main. ## +## ----------- ## # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -950,12 +1286,9 @@ # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_ltwrapper_scriptname_result="" - if func_ltwrapper_executable_p "$1"; then - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - fi + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" } # func_ltwrapper_p file @@ -1001,6 +1334,37 @@ } +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1013,13 +1377,15 @@ if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case $@ in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; # Blanks at the start of $base_compile will cause this to fail # if we don't check for them as well. *) @@ -1030,11 +1396,13 @@ CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case "$@ " in - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. @@ -1097,6 +1465,486 @@ } } + +################################################## +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # +################################################## + +# func_convert_core_file_wine_to_w32 ARG +# Helper function used by file name conversion functions when $build is *nix, +# and $host is mingw, cygwin, or some other w32 environment. Relies on a +# correctly configured wine environment available, with the winepath program +# in $build's $PATH. +# +# ARG is the $build file name to be converted to w32 format. +# Result is available in $func_convert_core_file_wine_to_w32_result, and will +# be empty on error (or when ARG is empty) +func_convert_core_file_wine_to_w32 () +{ + $opt_debug + func_convert_core_file_wine_to_w32_result="$1" + if test -n "$1"; then + # Unfortunately, winepath does not exit with a non-zero error code, so we + # are forced to check the contents of stdout. On the other hand, if the + # command is not found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both error code of + # zero AND non-empty stdout, which explains the odd construction: + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " \`$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result="$func_convert_core_msys_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 + + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_nix_to_cygwin + + # func_mode_compile arg... func_mode_compile () { @@ -1137,12 +1985,12 @@ ;; -pie | -fpie | -fPIE) - pie_flag="$pie_flag $arg" + func_append pie_flag " $arg" continue ;; -shared | -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" + func_append later " $arg" continue ;; @@ -1163,15 +2011,14 @@ save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" - func_quote_for_eval "$arg" - lastarg="$lastarg $func_quote_for_eval_result" + func_append_quoted lastarg "$arg" done IFS="$save_ifs" func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" + func_append base_compile " $lastarg" continue ;; @@ -1187,8 +2034,7 @@ esac # case $arg_mode # Aesthetically quote the previous argument. - func_quote_for_eval "$lastarg" - base_compile="$base_compile $func_quote_for_eval_result" + func_append_quoted base_compile "$lastarg" done # for arg case $arg_mode in @@ -1213,7 +2059,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx) + *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -1288,7 +2134,7 @@ # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" else output_obj= @@ -1319,17 +2165,16 @@ $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - removelist="$removelist $output_obj" + func_append removelist " $output_obj" $ECHO "$srcfile" > "$lockfile" fi $opt_dry_run || $RM $removelist - removelist="$removelist $lockfile" + func_append removelist " $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -1349,7 +2194,7 @@ if test -z "$output_obj"; then # Place PIC objects in $objdir - command="$command -o $lobj" + func_append command " -o $lobj" fi func_show_eval_locale "$command" \ @@ -1396,11 +2241,11 @@ command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - command="$command -o $obj" + func_append command " -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" + func_append command "$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -1445,13 +2290,13 @@ } $opt_help || { -test "$mode" = compile && func_mode_compile ${1+"$@"} + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $mode in + case $opt_mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -1482,10 +2327,11 @@ -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -1538,7 +2384,7 @@ The following components of INSTALL-COMMAND are treated specially: - -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." @@ -1558,6 +2404,8 @@ -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) @@ -1586,6 +2434,11 @@ -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) All other options (arguments beginning with \`-') are ignored. @@ -1619,18 +2472,44 @@ ;; *) - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" ;; esac - $ECHO + echo $ECHO "Try \`$progname --help' for more information about other modes." - - exit $? } - # Now that we've collected a possible --mode arg, show help if necessary - $opt_help && func_mode_help +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test "$opt_help" = :; then + func_mode_help + else + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + sed '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi # func_mode_execute arg... @@ -1643,13 +2522,16 @@ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do + for file in $opt_dlopen; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -1671,7 +2553,7 @@ dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" + func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -1712,7 +2594,7 @@ for file do case $file in - -*) ;; + -* | *.la | *.lo ) ;; *) # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then @@ -1728,8 +2610,7 @@ ;; esac # Quote arguments (to preserve shell metacharacters). - func_quote_for_eval "$file" - args="$args $func_quote_for_eval_result" + func_append_quoted args "$file" done if test "X$opt_dry_run" = Xfalse; then @@ -1754,29 +2635,66 @@ # Display what would be done. if test -n "$shlibpath_var"; then eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - $ECHO "export $shlibpath_var" + echo "export $shlibpath_var" fi $ECHO "$cmd$args" exit $EXIT_SUCCESS fi } -test "$mode" = execute && func_mode_execute ${1+"$@"} +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { $opt_debug - libdirs="$nonopt" + libs= + libdirs= admincmds= - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + else + func_fatal_error "invalid argument \`$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -1786,7 +2704,7 @@ if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $opt_dry_run || eval "$cmds" || func_append admincmds " $cmds" fi done @@ -1795,53 +2713,55 @@ # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - $ECHO "X----------------------------------------------------------------------" | $Xsed - $ECHO "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - $ECHO - $ECHO "If you ever happen to want to link against installed libraries" - $ECHO "in a given directory, LIBDIR, you must either use libtool, and" - $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" - $ECHO "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" - $ECHO " during execution" - fi - if test -n "$runpath_var"; then - $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" - $ECHO " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" fi - $ECHO - - $ECHO "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" - $ECHO "pages." - ;; - *) - $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - $ECHO "X----------------------------------------------------------------------" | $Xsed exit $EXIT_SUCCESS } -test "$mode" = finish && func_mode_finish ${1+"$@"} +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -1852,7 +2772,7 @@ # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - $ECHO "X$nonopt" | $GREP shtool >/dev/null; then + case $nonopt in *shtool*) :;; *) false;; esac; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -1866,7 +2786,12 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - install_prog="$install_prog$func_quote_for_eval_result" + func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac # We need to accept at least all the BSD install flags. dest= @@ -1876,10 +2801,12 @@ install_type= isdir=no stripme= + no_mode=: for arg do + arg2= if test -n "$dest"; then - files="$files $dest" + func_append files " $dest" dest=$arg continue fi @@ -1887,10 +2814,9 @@ case $arg in -d) isdir=yes ;; -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac + if $install_cp; then :; else + prev=$arg + fi ;; -g | -m | -o) prev=$arg @@ -1904,6 +2830,10 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi prev= else dest=$arg @@ -1914,7 +2844,11 @@ # Aesthetically quote the argument. func_quote_for_eval "$arg" - install_prog="$install_prog $func_quote_for_eval_result" + func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -1923,6 +2857,13 @@ test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -1977,10 +2918,13 @@ case $file in *.$libext) # Do the static libraries later. - staticlibs="$staticlibs $file" + func_append staticlibs " $file" ;; *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -1994,23 +2938,23 @@ if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + *) func_append current_libdirs " $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + *) func_append future_libdirs " $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - dir="$dir$objdir" + func_append dir "$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -2023,9 +2967,9 @@ if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2043,7 +2987,7 @@ test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in @@ -2083,7 +3027,7 @@ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + test -n "$old_library" && func_append staticlibs " $dir/$old_library" ;; *.lo) @@ -2183,7 +3127,7 @@ if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then func_warning "\`$lib' has not been installed in \`$libdir'" finalize=no @@ -2202,7 +3146,7 @@ file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -2221,7 +3165,7 @@ } else # Install the binary that we compiled earlier. - file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -2280,7 +3224,7 @@ fi } -test "$mode" = install && func_mode_install ${1+"$@"} +test "$opt_mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -2323,6 +3267,22 @@ extern \"C\" { #endif +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + /* External symbol declarations for the compiler. */\ " @@ -2332,10 +3292,11 @@ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. - progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -2371,7 +3332,7 @@ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin | *mingw* | *cegcc* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -2384,10 +3345,52 @@ func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac done $opt_dry_run || { @@ -2415,36 +3418,19 @@ if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { const char *name; void *address; } lt_dlsymlist; -" - case $host in - *cygwin* | *mingw* | *cegcc* ) - $ECHO >> "$output_objdir/$my_dlsyms" "\ -/* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" - lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; - *) - lt_dlsym_const=const ;; - esac - - $ECHO >> "$output_objdir/$my_dlsyms" "\ -extern $lt_dlsym_const lt_dlsymlist +extern LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -$lt_dlsym_const lt_dlsymlist +LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -2457,7 +3443,7 @@ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -2500,7 +3486,7 @@ for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) symtab_cflags="$symtab_cflags $arg" ;; + *) func_append symtab_cflags " $arg" ;; esac done @@ -2515,16 +3501,16 @@ case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` else - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` fi ;; *) - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -2538,8 +3524,8 @@ # really was required. # Nullify the symbol file. - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` fi } @@ -2549,6 +3535,7 @@ # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. func_win32_libid () { $opt_debug @@ -2559,9 +3546,11 @@ win32_libid_type="x86 archive import" ;; *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | $SED -n -e ' 1,100{ / I /{ @@ -2590,6 +3579,131 @@ $ECHO "$win32_libid_type" } +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} # func_extract_an_archive dir oldlib @@ -2598,7 +3712,18 @@ $opt_debug f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' + if test "$lock_old_archive_extraction" = yes; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then + $opt_dry_run || rm -f "$lockfile" + fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else @@ -2669,7 +3794,7 @@ darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -2684,25 +3809,30 @@ func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done func_extract_archives_result="$my_oldobjs" } - -# func_emit_wrapper_part1 [arg=no] +# func_emit_wrapper [arg=no] # -# Emit the first part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part1 () -{ - func_emit_wrapper_part1_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part1_arg1=$1 - fi +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=${1-no} $ECHO "\ #! $SHELL @@ -2718,7 +3848,6 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # Be Bourne compatible @@ -2749,31 +3878,132 @@ else # When we are sourced in execute mode, \$file and \$ECHO are already set. if test \"\$libtool_execute_magic\" != \"$magic\"; then - ECHO=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$ECHO works! - : - else - # Restart under the correct shell, and then maybe \$ECHO will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ which is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options which match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ " - $ECHO "\ + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} # Find the directory that this script lives in. - thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -2783,30 +4013,13 @@ esac fi - file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` done -" -} -# end: func_emit_wrapper_part1 - -# func_emit_wrapper_part2 [arg=no] -# -# Emit the second part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part2 () -{ - func_emit_wrapper_part2_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part2_arg1=$1 - fi - - $ECHO "\ # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then # special case for '.' if test \"\$thisdir\" = \".\"; then @@ -2814,7 +4027,7 @@ fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -2869,6 +4082,18 @@ if test -f \"\$progdir/\$program\"; then" + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -2877,253 +4102,28 @@ # Some systems cannot cope with colon-terminated $shlibpath_var # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` export $shlibpath_var " fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 + func_exec_program \${1+\"\$@\"} fi else # The program doesn't exist. \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi fi\ " } -# end: func_emit_wrapper_part2 - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=no - if test -n "$1" ; then - func_emit_wrapper_arg1=$1 - fi - - # split this up so that func_emit_cwrapperexe_src - # can call each part independently. - func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" - func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" -} - - -# func_to_host_path arg -# -# Convert paths to host format when used with build tools. -# Intended for use with "native" mingw (where libtool itself -# is running under the msys shell), or in the following cross- -# build environments: -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# where wine is equipped with the `winepath' executable. -# In the native mingw case, the (msys) shell automatically -# converts paths for any non-msys applications it launches, -# but that facility isn't available from inside the cwrapper. -# Similar accommodations are necessary for $host mingw and -# $build cygwin. Calling this function does no harm for other -# $host/$build combinations not listed above. -# -# ARG is the path (on $build) that should be converted to -# the proper representation for $host. The result is stored -# in $func_to_host_path_result. -func_to_host_path () -{ - func_to_host_path_result="$1" - if test -n "$1" ; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - case $build in - *mingw* ) # actually, msys - # awkward: cmd appends spaces to result - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_path_tmp1=`( cmd //c echo "$1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_path_tmp1=`cygpath -w "$1"` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # Unfortunately, winepath does not exit with a non-zero - # error code, so we are forced to check the contents of - # stdout. On the other hand, if the command is not - # found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both - # error code of zero AND non-empty stdout, which explains - # the odd construction: - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - else - # Allow warning below. - func_to_host_path_result="" - fi - ;; - esac - if test -z "$func_to_host_path_result" ; then - func_error "Could not determine host path corresponding to" - func_error " '$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_path_result="$1" - fi - ;; - esac - fi -} -# end: func_to_host_path -# func_to_host_pathlist arg -# -# Convert pathlists to host format when used with build tools. -# See func_to_host_path(), above. This function supports the -# following $build/$host combinations (but does no harm for -# combinations not listed here): -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# -# Path separators are also converted from $build format to -# $host format. If ARG begins or ends with a path separator -# character, it is preserved (but converted to $host format) -# on output. -# -# ARG is a pathlist (on $build) that should be converted to -# the proper representation on $host. The result is stored -# in $func_to_host_pathlist_result. -func_to_host_pathlist () -{ - func_to_host_pathlist_result="$1" - if test -n "$1" ; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_to_host_pathlist_tmp2="$1" - # Once set for this call, this variable should not be - # reassigned. It is used in tha fallback case. - func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e 's|^:*||' -e 's|:*$||'` - case $build in - *mingw* ) # Actually, msys. - # Awkward: cmd appends spaces to result. - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # unfortunately, winepath doesn't convert pathlists - func_to_host_pathlist_result="" - func_to_host_pathlist_oldIFS=$IFS - IFS=: - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do - IFS=$func_to_host_pathlist_oldIFS - if test -n "$func_to_host_pathlist_f" ; then - func_to_host_path "$func_to_host_pathlist_f" - if test -n "$func_to_host_path_result" ; then - if test -z "$func_to_host_pathlist_result" ; then - func_to_host_pathlist_result="$func_to_host_path_result" - else - func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" - fi - fi - fi - IFS=: - done - IFS=$func_to_host_pathlist_oldIFS - ;; - esac - if test -z "$func_to_host_pathlist_result" ; then - func_error "Could not determine the host path(s) corresponding to" - func_error " '$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This may break if $1 contains DOS-style drive - # specifications. The fix is not to complicate the expression - # below, but for the user to provide a working wine installation - # with winepath so that path translation in the cross-to-mingw - # case works properly. - lt_replace_pathsep_nix_to_dos="s|:|;|g" - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_replace_pathsep_nix_to_dos"` - fi - # Now, add the leading and trailing path separators back - case "$1" in - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" - ;; - esac - case "$1" in - *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" - ;; - esac - ;; - esac - fi -} -# end: func_to_host_pathlist # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout @@ -3141,41 +4141,71 @@ This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. - - Currently, it simply execs the wrapper *script* "$SHELL $output", - but could eventually absorb all of the scripts functionality and - exec $objdir/$outputname directly. */ EOF cat <<"EOF" +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE 1 +#endif #include #include #ifdef _MSC_VER # include # include # include -# define setmode _setmode #else # include # include # ifdef __CYGWIN__ # include -# define HAVE_SETENV -# ifdef __STRICT_ANSI__ +# endif +#endif +#include +#include +#include +#include +#include +#include +#include +#include + +/* declarations of non-ANSI functions */ +#if defined(__MINGW32__) +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined(__CYGWIN__) +# ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); -# endif # endif +/* #elif defined (other platforms) ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined(_MSC_VER) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined(__CYGWIN__) +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined (other platforms) ... */ #endif -#include -#include -#include -#include -#include -#include -#include -#include #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -3192,14 +4222,7 @@ # define S_IXGRP 0 #endif -#ifdef _MSC_VER -# define S_IXUSR _S_IEXEC -# define stat _stat -# ifndef _INTPTR_T_DEFINED -# define intptr_t int -# endif -#endif - +/* path handling portability macros */ #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -3230,10 +4253,6 @@ # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ -#ifdef __CYGWIN__ -# define FOPEN_WB "wb" -#endif - #ifndef FOPEN_WB # define FOPEN_WB "w" #endif @@ -3246,22 +4265,13 @@ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#undef LTWRAPPER_DEBUGPRINTF -#if defined DEBUGWRAPPER -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args -static void -ltwrapper_debugprintf (const char *fmt, ...) -{ - va_list args; - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); -} +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; #else -# define LTWRAPPER_DEBUGPRINTF(args) +static int lt_debug = 0; #endif -const char *program_name = NULL; +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -3271,41 +4281,27 @@ int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); -void lt_fatal (const char *message, ...); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); void lt_setenv (const char *name, const char *value); char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_opt_process_env_set (const char *arg); -void lt_opt_process_env_prepend (const char *arg); -void lt_opt_process_env_append (const char *arg); -int lt_split_name_value (const char *arg, char** name, char** value); void lt_update_exe_path (const char *name, const char *value); void lt_update_lib_path (const char *name, const char *value); - -static const char *script_text_part1 = -EOF - - func_emit_wrapper_part1 yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ "/' -e 's/$/\\n"/' - echo ";" - cat <"))); + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", + nonnull (lt_argv_zero)); for (i = 0; i < newargc; i++) { - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", + i, nonnull (newargz[i])); } EOF @@ -3560,11 +4517,14 @@ mingw*) cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ + newargz = prepare_spawn (newargz); rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); if (rval == -1) { /* failed to start process */ - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); + lt_debugprintf (__FILE__, __LINE__, + "(main) failed to launch target \"%s\": %s\n", + lt_argv_zero, nonnull (strerror (errno))); return 127; } return rval; @@ -3586,7 +4546,7 @@ { void *p = (void *) malloc (num); if (!p) - lt_fatal ("Memory exhausted"); + lt_fatal (__FILE__, __LINE__, "memory exhausted"); return p; } @@ -3620,8 +4580,8 @@ { struct stat st; - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3638,8 +4598,8 @@ int rval = 0; struct stat st; - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3665,8 +4625,8 @@ int tmp_len; char *concat_name; - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; @@ -3719,7 +4679,8 @@ { /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); @@ -3744,7 +4705,8 @@ } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); memcpy (concat_name, tmp, tmp_len); @@ -3770,8 +4732,9 @@ int has_symlinks = 0; while (strlen (tmp_pathspec) && !has_symlinks) { - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", - tmp_pathspec)); + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); if (lstat (tmp_pathspec, &s) == 0) { if (S_ISLNK (s.st_mode) != 0) @@ -3793,8 +4756,9 @@ } else { - char *errstr = strerror (errno); - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); } } XFREE (tmp_pathspec); @@ -3807,7 +4771,8 @@ tmp_pathspec = realpath (pathspec, buf); if (tmp_pathspec == 0) { - lt_fatal ("Could not follow symlinks for %s", pathspec); + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); } return xstrdup (tmp_pathspec); #endif @@ -3833,11 +4798,25 @@ return str; } +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} + static void -lt_error_core (int exit_status, const char *mode, +lt_error_core (int exit_status, const char *file, + int line, const char *mode, const char *message, va_list ap) { - fprintf (stderr, "%s: %s: ", program_name, mode); + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); @@ -3846,20 +4825,32 @@ } void -lt_fatal (const char *message, ...) +lt_fatal (const char *file, int line, const char *message, ...) { va_list ap; va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); va_end (ap); } +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} + +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} + void lt_setenv (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ @@ -3904,95 +4895,12 @@ return new_value; } -int -lt_split_name_value (const char *arg, char** name, char** value) -{ - const char *p; - int len; - if (!arg || !*arg) - return 1; - - p = strchr (arg, (int)'='); - - if (!p) - return 1; - - *value = xstrdup (++p); - - len = strlen (arg) - strlen (*value); - *name = XMALLOC (char, len); - strncpy (*name, arg, len-1); - (*name)[len - 1] = '\0'; - - return 0; -} - -void -lt_opt_process_env_set (const char *arg) -{ - char *name = NULL; - char *value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); - } - - lt_setenv (name, value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_prepend (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_append (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 1); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - void lt_update_exe_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4011,9 +4919,9 @@ void lt_update_lib_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4023,11 +4931,152 @@ } } +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' + cat <<"EOF" +} EOF } # end: func_emit_cwrapperexe_src +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $opt_debug + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + # func_mode_link arg... func_mode_link () { @@ -4072,6 +5121,7 @@ new_inherited_linker_flags= avoid_version=no + bindir= dlfiles= dlprefiles= dlself=no @@ -4164,6 +5214,11 @@ esac case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -4195,9 +5250,9 @@ ;; *) if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" + func_append dlfiles " $arg" else - dlprefiles="$dlprefiles $arg" + func_append dlprefiles " $arg" fi prev= continue @@ -4221,7 +5276,7 @@ *-*-darwin*) case "$deplibs " in *" $qarg.ltframework "*) ;; - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later + *) func_append deplibs " $qarg.ltframework" # this is fixed later ;; esac ;; @@ -4240,7 +5295,7 @@ moreargs= for fil in `cat "$save_arg"` do -# moreargs="$moreargs $fil" +# func_append moreargs " $fil" arg=$fil # A libtool-controlled object. @@ -4269,7 +5324,7 @@ if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -4281,7 +5336,7 @@ # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" + func_append dlprefiles " $pic_object" prev= fi @@ -4351,12 +5406,12 @@ if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; - *) rpath="$rpath $arg" ;; + *) func_append rpath " $arg" ;; esac else case "$xrpath " in *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; + *) func_append xrpath " $arg" ;; esac fi prev= @@ -4368,28 +5423,28 @@ continue ;; weak) - weak_libs="$weak_libs $arg" + func_append weak_libs " $arg" prev= continue ;; xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xcompiler) - compiler_flags="$compiler_flags $qarg" + func_append compiler_flags " $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" prev= func_append compile_command " $wl$qarg" func_append finalize_command " $wl$qarg" @@ -4425,6 +5480,11 @@ continue ;; + -bindir) + prev=bindir + continue + ;; + -dlopen) prev=dlfiles continue @@ -4475,15 +5535,16 @@ ;; -L*) - func_stripname '-L' '' "$arg" - dir=$func_stripname_result - if test -z "$dir"; then + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then if test "$#" -gt 0; then func_fatal_error "require no space between \`-L' and \`$1'" else func_fatal_error "need path for \`-L' option" fi fi + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -4495,24 +5556,30 @@ ;; esac case "$deplibs " in - *" -L$dir "*) ;; + *" -L$dir "* | *" $arg "*) + # Will only happen for absolute or sysroot arguments + ;; *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" + # Preserve sysroot, but never include relative directories + case $dir in + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; + esac + func_append lib_search_path " $dir" ;; esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; - *) dllsearchpath="$dllsearchpath:$dir";; + *) func_append dllsearchpath ":$dir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -4522,7 +5589,7 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; @@ -4536,7 +5603,7 @@ ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs System.ltframework" + func_append deplibs " System.ltframework" continue ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -4556,7 +5623,7 @@ ;; esac fi - deplibs="$deplibs $arg" + func_append deplibs " $arg" continue ;; @@ -4568,8 +5635,8 @@ # Tru64 UNIX uses -model [arg] to determine the layout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot) - compiler_flags="$compiler_flags $arg" + -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" prev=xcompiler @@ -4577,12 +5644,12 @@ ;; -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" + func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" case "$new_inherited_linker_flags " in *" $arg "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; + * ) func_append new_inherited_linker_flags " $arg" ;; esac continue ;; @@ -4649,13 +5716,17 @@ # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; + =*) + func_stripname '=' '' "$dir" + dir=$lt_sysroot$func_stripname_result + ;; *) func_fatal_error "only absolute run-paths are allowed" ;; esac case "$xrpath " in *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; + *) func_append xrpath " $dir" ;; esac continue ;; @@ -4708,8 +5779,8 @@ for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $func_quote_for_eval_result" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -4724,9 +5795,9 @@ for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" - linker_flags="$linker_flags $func_quote_for_eval_result" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -4754,23 +5825,27 @@ arg="$func_quote_for_eval_result" ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" func_append finalize_command " $arg" - compiler_flags="$compiler_flags $arg" + func_append compiler_flags " $arg" continue ;; @@ -4782,7 +5857,7 @@ *.$objext) # A standard object. - objs="$objs $arg" + func_append objs " $arg" ;; *.lo) @@ -4813,7 +5888,7 @@ if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -4825,7 +5900,7 @@ # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" + func_append dlprefiles " $pic_object" prev= fi @@ -4870,24 +5945,25 @@ *.$libext) # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" + func_append deplibs " $arg" + func_append old_deplibs " $arg" continue ;; *.la) # A libtool-controlled library. + func_resolve_sysroot "$arg" if test "$prev" = dlfiles; then # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" + func_append dlfiles " $func_resolve_sysroot_result" prev= elif test "$prev" = dlprefiles; then # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" + func_append dlprefiles " $func_resolve_sysroot_result" prev= else - deplibs="$deplibs $arg" + func_append deplibs " $func_resolve_sysroot_result" fi continue ;; @@ -4925,7 +6001,7 @@ if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi @@ -4934,6 +6010,8 @@ func_dirname "$output" "/" "" output_objdir="$func_dirname_result$objdir" + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result # Create the object directory. func_mkdir_p "$output_objdir" @@ -4954,12 +6032,12 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - libs="$libs $deplib" + func_append libs " $deplib" done if test "$linkmode" = lib; then @@ -4972,9 +6050,9 @@ if $opt_duplicate_compiler_generated_deps; then for pre_post_dep in $predeps $postdeps; do case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; esac - pre_post_deps="$pre_post_deps $pre_post_dep" + func_append pre_post_deps " $pre_post_dep" done fi pre_post_deps= @@ -5033,7 +6111,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -5041,17 +6122,19 @@ for lib in $dlprefiles; do # Ignore non-libtool-libs dependency_libs= + func_resolve_sysroot "$lib" case $lib in - *.la) func_source "$lib" ;; + *.la) func_source "$func_resolve_sysroot_result" ;; esac # Collect preopened libtool deplibs, except any this library # has declared as weak libs for deplib in $dependency_libs; do - deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` + func_basename "$deplib" + deplib_base=$func_basename_result case " $weak_libs " in *" $deplib_base "*) ;; - *) deplibs="$deplibs $deplib" ;; + *) func_append deplibs " $deplib" ;; esac done done @@ -5072,11 +6155,11 @@ compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - compiler_flags="$compiler_flags $deplib" + func_append compiler_flags " $deplib" if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -5161,7 +6244,7 @@ if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -5174,7 +6257,8 @@ test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) if test "$pass" = conv; then @@ -5188,7 +6272,8 @@ finalize_deplibs="$deplib $finalize_deplibs" fi func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) func_warning "\`-L' is ignored for archives/objects" @@ -5199,17 +6284,21 @@ -R*) if test "$pass" = link; then func_stripname '-R' '' "$deplib" - dir=$func_stripname_result + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; + *) func_append xrpath " $dir" ;; esac fi deplibs="$deplib $deplibs" continue ;; - *.la) lib="$deplib" ;; + *.la) + func_resolve_sysroot "$deplib" + lib=$func_resolve_sysroot_result + ;; *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" @@ -5227,7 +6316,7 @@ match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -5237,15 +6326,15 @@ ;; esac if test "$valid_a_lib" != yes; then - $ECHO + echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because the file extensions .$libext of this argument makes me believe" - $ECHO "*** that it is just a static archive that I should not use here." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -5272,11 +6361,11 @@ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. - newdlprefiles="$newdlprefiles $deplib" + func_append newdlprefiles " $deplib" compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - newdlfiles="$newdlfiles $deplib" + func_append newdlfiles " $deplib" fi fi continue @@ -5318,20 +6407,20 @@ # Convert "-framework foo" to "foo.ltframework" if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; esac done fi - dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi if test "$pass" = conv; then @@ -5342,30 +6431,36 @@ func_fatal_error "cannot find name of link library for \`$lib'" fi # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done continue fi # $pass = conv # Get the name of the library we link against. linklib= - for l in $old_library $library_names; do - linklib="$l" - done + if test -n "$old_library" && + { test "$prefer_static_libs" = yes || + test "$prefer_static_libs,$installed" = "built,no"; }; then + linklib=$old_library + else + for l in $old_library $library_names; do + linklib="$l" + done + fi if test -z "$linklib"; then func_fatal_error "cannot find name of link library for \`$lib'" fi @@ -5382,9 +6477,9 @@ # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" + func_append dlprefiles " $lib $dependency_libs" else - newdlfiles="$newdlfiles $lib" + func_append newdlfiles " $lib" fi continue fi # $pass = dlopen @@ -5406,14 +6501,14 @@ # Find the relevant object directory and library name. if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then func_warning "library \`$lib' was moved." dir="$ladir" absdir="$abs_ladir" libdir="$abs_ladir" else - dir="$libdir" - absdir="$libdir" + dir="$lt_sysroot$libdir" + absdir="$lt_sysroot$libdir" fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -5421,12 +6516,12 @@ dir="$ladir" absdir="$abs_ladir" # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + func_append notinst_path " $abs_ladir" else dir="$ladir/$objdir" absdir="$abs_ladir/$objdir" # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + func_append notinst_path " $abs_ladir" fi fi # $installed = yes func_stripname 'lib' '.la' "$laname" @@ -5437,20 +6532,46 @@ if test -z "$libdir" && test "$linkmode" = prog; then func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi + case "$host" in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both + # static and shared are present. Therefore, ensure we extract + # symbols from the import library if a shared library is present + # (otherwise, the dlopen module name will be incorrect). We do + # this by putting the import library name into $newdlprefiles. + # We recover the dlopen module name by 'saving' the la file + # name in a special purpose variable, and (later) extracting the + # dlname from the la file. + if test -n "$dlname"; then + func_tr_sh "$dir/$linklib" + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" + func_append newdlprefiles " $dir/$linklib" + else + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + fi + ;; + * ) + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + func_append newdlprefiles " $dir/$dlname" + else + func_append newdlprefiles " $dir/$linklib" + fi + ;; + esac fi # $pass = dlpreopen if test -z "$libdir"; then @@ -5468,7 +6589,7 @@ if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" + func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" linkalldeplibs=no @@ -5481,7 +6602,8 @@ for deplib in $dependency_libs; do case $deplib in -L*) func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; esac # Need to link against all dependency_libs? @@ -5492,12 +6614,12 @@ # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $deplib" done # for deplib continue fi # $linkmode = prog... @@ -5512,7 +6634,7 @@ # Make sure the rpath contains only unique directories. case "$temp_rpath:" in *"$absdir:"*) ;; - *) temp_rpath="$temp_rpath$absdir:" ;; + *) func_append temp_rpath "$absdir:" ;; esac fi @@ -5524,7 +6646,7 @@ *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -5533,7 +6655,7 @@ *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -5558,12 +6680,12 @@ case $host in *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=no ;; *) if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=yes fi ;; @@ -5580,7 +6702,7 @@ fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - $ECHO + echo if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -5598,7 +6720,7 @@ *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -5607,7 +6729,7 @@ *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -5661,7 +6783,7 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$mode" != relink; then + if test "$linkmode" = prog || test "$opt_mode" != relink; then add_shlibpath= add_dir= add= @@ -5683,9 +6805,9 @@ if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" if test -z "$old_library" ; then - $ECHO - $ECHO "*** And there doesn't seem to be a static archive available" - $ECHO "*** The link will probably fail, sorry" + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" else add="$dir/$old_library" fi @@ -5717,7 +6839,7 @@ if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -5739,7 +6861,7 @@ if test -n "$add_shlibpath"; then case :$compile_shlibpath: in *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi if test "$linkmode" = prog; then @@ -5753,13 +6875,13 @@ test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac fi fi fi - if test "$linkmode" = prog || test "$mode" = relink; then + if test "$linkmode" = prog || test "$opt_mode" = relink; then add_shlibpath= add_dir= add= @@ -5773,7 +6895,7 @@ elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac add="-l$name" elif test "$hardcode_automatic" = yes; then @@ -5790,7 +6912,7 @@ if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -5825,21 +6947,21 @@ # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - $ECHO + echo $ECHO "*** Warning: This system can not link to static lib archive $lib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - $ECHO "*** But as you try to build a module library, libtool will still create " - $ECHO "*** a static module, that should work as long as the dlopening application" - $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then build_libtool_libs=module @@ -5867,37 +6989,46 @@ temp_xrpath=$func_stripname_result case " $xrpath " in *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; + *) func_append xrpath " $temp_xrpath";; esac;; - *) temp_deplibs="$temp_deplibs $libdir";; + *) func_append temp_deplibs " $libdir";; esac done dependency_libs="$temp_deplibs" fi - newlib_search_path="$newlib_search_path $absdir" + func_append newlib_search_path " $absdir" # Link against this library test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" - if $opt_duplicate_deps ; then + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $func_resolve_sysroot_result" done if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do + path= case $deplib in -L*) path="$deplib" ;; *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result func_dirname "$deplib" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; @@ -5924,8 +7055,8 @@ if test -z "$darwin_install_name"; then darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" path= fi fi @@ -5958,7 +7089,7 @@ compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else - compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -5975,7 +7106,7 @@ for dir in $newlib_search_path; do case "$lib_search_path " in *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; + *) func_append lib_search_path " $dir" ;; esac done newlib_search_path= @@ -6033,10 +7164,10 @@ -L*) case " $tmp_libs " in *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac ;; - *) tmp_libs="$tmp_libs $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac done eval $var=\"$tmp_libs\" @@ -6052,7 +7183,7 @@ ;; esac if test -n "$i" ; then - tmp_libs="$tmp_libs $i" + func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs @@ -6093,7 +7224,7 @@ # Now set the variables for building old libraries. build_libtool_libs=no oldlibs="$output" - objs="$objs$old_deplibs" + func_append objs "$old_deplibs" ;; lib) @@ -6126,10 +7257,10 @@ if test "$deplibs_check_method" != pass_all; then func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" - libobjs="$libobjs $objs" + func_append libobjs " $objs" fi fi @@ -6194,7 +7325,7 @@ age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) + freebsd-aout|freebsd-elf|qnx|sunos) current="$number_major" revision="$number_minor" age="0" @@ -6206,6 +7337,9 @@ revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) @@ -6327,7 +7461,7 @@ done # Make executables depend on our current version. - verstring="$verstring:${current}.0" + func_append verstring ":${current}.0" ;; qnx) @@ -6395,10 +7529,10 @@ fi func_generate_dlsyms "$libname" "$libname" "yes" - libobjs="$libobjs $symfileobj" + func_append libobjs " $symfileobj" test "X$libobjs" = "X " && libobjs= - if test "$mode" != relink; then + if test "$opt_mode" != relink; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -6414,7 +7548,7 @@ continue fi fi - removelist="$removelist $p" + func_append removelist " $p" ;; *) ;; esac @@ -6425,27 +7559,28 @@ # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" + func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. #for path in $notinst_path; do - # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` - # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` - # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. temp_xrpath= for libdir in $xrpath; do - temp_xrpath="$temp_xrpath -R$libdir" + func_replace_sysroot "$libdir" + func_append temp_xrpath " -R$func_replace_sysroot_result" case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then @@ -6459,7 +7594,7 @@ for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; + *) func_append dlfiles " $lib" ;; esac done @@ -6469,19 +7604,19 @@ for lib in $old_dlprefiles; do case "$dlprefiles " in *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; + *) func_append dlprefiles " $lib" ;; esac done if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C library is in the System framework - deplibs="$deplibs System.ltframework" + func_append deplibs " System.ltframework" ;; *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. @@ -6498,7 +7633,7 @@ *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" + func_append deplibs " -lc" fi ;; esac @@ -6547,7 +7682,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" i="" ;; esac @@ -6558,21 +7693,21 @@ set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which I believe you do not have" - $ECHO "*** because a test_compile did reveal that the linker did not use it for" - $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which I believe you do not have" + echo "*** because a test_compile did reveal that the linker did not use it for" + echo "*** its dynamic dependency list that programs get resolved with at runtime." fi fi ;; *) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" ;; esac done @@ -6590,7 +7725,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" i="" ;; esac @@ -6601,29 +7736,29 @@ set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because a test_compile did reveal that the linker did not use this one" - $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because a test_compile did reveal that the linker did not use this one" + echo "*** as a dynamic dependency that programs can get resolved with at runtime." fi fi else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning! Library $i is needed by this library but I was not able to" - $ECHO "*** make it link in! You will probably need to install it or some" - $ECHO "*** library that it depends on before this library will be fully" - $ECHO "*** functional. Installing it before continuing would be even better." + echo "*** make it link in! You will probably need to install it or some" + echo "*** library that it depends on before this library will be fully" + echo "*** functional. Installing it before continuing would be even better." fi ;; *) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" ;; esac done @@ -6640,15 +7775,27 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac fi if test -n "$a_deplib" ; then libname=`eval "\\$ECHO \"$libname_spec\""` + if test -n "$file_magic_glob"; then + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` + else + libnameglob=$libname + fi + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + if test "$want_nocaseglob" = yes; then + shopt -s nocaseglob + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -6665,13 +7812,13 @@ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -6680,12 +7827,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else @@ -6696,7 +7843,7 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -6712,7 +7859,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac @@ -6723,9 +7870,9 @@ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -6734,12 +7881,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else @@ -6750,32 +7897,32 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ - -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then for i in $predeps $postdeps ; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` done fi - if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | - $GREP . >/dev/null; then - $ECHO + case $tmp_deplibs in + *[!\ \ ]*) + echo if test "X$deplibs_check_method" = "Xnone"; then - $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + echo "*** Warning: inter-library dependencies are not supported in this platform." else - $ECHO "*** Warning: inter-library dependencies are not known to be supported." + echo "*** Warning: inter-library dependencies are not known to be supported." fi - $ECHO "*** All declared inter-library dependencies are being dropped." + echo "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - fi + ;; + esac ;; esac versuffix=$versuffix_save @@ -6787,23 +7934,23 @@ case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac if test "$droppeddeps" = yes; then if test "$module" = yes; then - $ECHO - $ECHO "*** Warning: libtool could not satisfy all declared inter-library" + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - $ECHO "*** a static module, that should work as long as the dlopening" - $ECHO "*** application is linked with the -dlopen flag." + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -6813,16 +7960,16 @@ build_libtool_libs=no fi else - $ECHO "*** The inter-library dependencies that have been dropped here will be" - $ECHO "*** automatically added whenever a program is linked with this library" - $ECHO "*** or is declared to -dlopen it." + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." if test "$allow_undefined" = no; then - $ECHO - $ECHO "*** Since this library must not contain undefined symbols," - $ECHO "*** because either the platform does not support them or" - $ECHO "*** it was explicitly requested with -no-undefined," - $ECHO "*** libtool will only create a static version of it." + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module @@ -6839,9 +7986,9 @@ # Time to change all our "foo.ltframework" stuff back to "-framework foo" case $host in *-*-darwin*) - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -6854,7 +8001,7 @@ *) case " $deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -6864,10 +8011,10 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done deplibs="$new_libs" @@ -6884,10 +8031,12 @@ hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -6896,18 +8045,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" + func_append dep_rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_apped perm_rpath " $libdir" ;; esac fi done @@ -6925,7 +8074,7 @@ # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -6933,7 +8082,7 @@ fi shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -6959,18 +8108,18 @@ linknames= for link do - linknames="$linknames $link" + func_append linknames " $link" done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - delfiles="$delfiles $export_symbols" + func_append delfiles " $export_symbols" fi orig_export_symbols= @@ -7001,13 +8150,45 @@ $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do + for cmd1 in $cmds; do IFS="$save_ifs" - eval cmd=\"$cmd\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -7029,7 +8210,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -7041,7 +8222,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7051,7 +8232,7 @@ case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs="$tmp_deplibs $test_deplib" + func_append tmp_deplibs " $test_deplib" ;; esac done @@ -7071,21 +8252,21 @@ test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" + func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -7130,7 +8311,8 @@ save_libobjs=$libobjs fi save_output=$output - output_la=`$ECHO "X$output" | $Xsed -e "$basename"` + func_basename "$output" + output_la=$func_basename_result # Clear the reloadable object creation command queue and # initialize k to one. @@ -7143,13 +8325,16 @@ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" - $ECHO 'INPUT (' > $output + echo 'INPUT (' > $output for obj in $save_libobjs do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - $ECHO ')' >> $output - delfiles="$delfiles $output" + echo ')' >> $output + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -7163,10 +8348,12 @@ fi for obj do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - delfiles="$delfiles $output" - output=$firstobj\"$file_list_spec$output\" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -7190,17 +8377,19 @@ # command to the queue. if test "$k" -eq 1 ; then # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" else # All subsequent reloadable object files will link in # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result output=$output_objdir/$output_la-${k}.$objext - objlist=$obj + objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -7210,11 +8399,12 @@ # reloadable object file. All subsequent reloadable object # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - delfiles="$delfiles $output" + func_append delfiles " $output" else output= @@ -7248,7 +8438,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7269,7 +8459,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -7281,7 +8471,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7322,10 +8512,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -7341,7 +8531,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7353,7 +8543,7 @@ IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -7434,18 +8624,21 @@ if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' @@ -7505,8 +8698,8 @@ case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac @@ -7517,14 +8710,14 @@ if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" ;; esac fi # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -7538,7 +8731,7 @@ *) case " $compile_deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7548,17 +8741,17 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done compile_deplibs="$new_libs" - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -7566,7 +8759,7 @@ # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done fi @@ -7585,18 +8778,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi case $host in @@ -7605,12 +8798,12 @@ case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) dllsearchpath="$dllsearchpath:$libdir";; + *) func_append dllsearchpath ":$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -7636,18 +8829,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + *) func_append finalize_perm_rpath " $libdir" ;; esac fi done @@ -7661,8 +8854,8 @@ if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. - compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi func_generate_dlsyms "$outputname" "@PROGRAM@" "no" @@ -7674,15 +8867,15 @@ wrappers_required=yes case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; *cygwin* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi ;; - *cegcc) - # Disable wrappers for cegcc, we are cross compiling anyway. - wrappers_required=no - ;; *) if test "$need_relink" = no || test "$build_libtool_libs" != yes; then wrappers_required=no @@ -7691,13 +8884,19 @@ esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. exit_status=0 func_show_eval "$link_command" 'exit_status=$?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -7720,7 +8919,7 @@ # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -7728,7 +8927,7 @@ # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -7738,11 +8937,18 @@ # We don't need to create a wrapper script. link_command="$compile_var$compile_command$compile_rpath" # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + exit $EXIT_SUCCESS fi @@ -7757,7 +8963,7 @@ if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -7769,13 +8975,19 @@ fi # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` # Delete the old output files. $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname func_show_eval "$link_command" 'exit $?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Now create the wrapper script. func_verbose "creating $output" @@ -7793,18 +9005,7 @@ fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $ECHO for shipping. - if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -7884,7 +9085,7 @@ else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - oldobjs="$oldobjs $symfileobj" + func_append oldobjs " $symfileobj" fi fi addlibs="$old_convenience" @@ -7892,10 +9093,10 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # Do each command in the archive commands. @@ -7906,10 +9107,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -7925,9 +9126,9 @@ done | sort | sort -uc >/dev/null 2>&1); then : else - $ECHO "copying selected object files to avoid basename conflicts..." + echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -7951,9 +9152,9 @@ esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" ;; - *) oldobjs="$oldobjs $obj" ;; + *) func_append oldobjs " $obj" ;; esac done fi @@ -7963,6 +9164,16 @@ len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -8036,7 +9247,7 @@ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -8059,9 +9270,19 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - newdependency_libs="$newdependency_libs $libdir/$name" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" + ;; + *) func_append newdependency_libs " $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -8075,9 +9296,9 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlfiles="$newdlfiles $libdir/$name" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; - *) newdlfiles="$newdlfiles $lib" ;; + *) func_append newdlfiles " $lib" ;; esac done dlfiles="$newdlfiles" @@ -8094,7 +9315,7 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlprefiles="$newdlprefiles $libdir/$name" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done @@ -8106,7 +9327,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlfiles="$newdlfiles $abs" + func_append newdlfiles " $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -8115,15 +9336,33 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlprefiles="$newdlprefiles $abs" + func_append newdlprefiles " $abs" done dlprefiles="$newdlprefiles" fi $RM $output # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test "x$bindir" != x ; + then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; esac $ECHO > $output "\ # $outputname - a libtool library file @@ -8182,7 +9421,7 @@ exit $EXIT_SUCCESS } -{ test "$mode" = link || test "$mode" = relink; } && +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && func_mode_link ${1+"$@"} @@ -8202,9 +9441,9 @@ for arg do case $arg in - -f) RM="$RM $arg"; rmforce=yes ;; - -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; esac done @@ -8213,24 +9452,23 @@ rmdirs= - origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - objdir="$origobjdir" + odir="$objdir" else - objdir="$dir/$origobjdir" + odir="$dir/$objdir" fi func_basename "$file" name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" + test "$opt_mode" = uninstall && odir="$dir" - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; esac fi @@ -8256,18 +9494,17 @@ # Delete the libtool libraries and symlinks. for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" + func_append rmfiles " $odir/$n" done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$mode" in + case "$opt_mode" in clean) - case " $library_names " in - # " " in the beginning catches empty $dlname + case " $library_names " in *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -8295,19 +9532,19 @@ # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" + func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" + func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$mode" = clean ; then + if test "$opt_mode" = clean ; then noexename=$name case $file in *.exe) @@ -8317,7 +9554,7 @@ noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - rmfiles="$rmfiles $file" + func_append rmfiles " $file" ;; esac # Do a test to see if this is a libtool program. @@ -8326,7 +9563,7 @@ func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + func_append rmfiles " $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -8334,12 +9571,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + func_append rmfiles " $odir/lt-$name" fi if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi @@ -8347,7 +9584,6 @@ esac func_show_eval "$RM $rmfiles" 'exit_status=1' done - objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -8359,16 +9595,16 @@ exit $exit_status } -{ test "$mode" = uninstall || test "$mode" = clean; } && +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$mode" && { +test -z "$opt_mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff -Nru libepc-0.3.11/m4/gtk-doc.m4 libepc-0.4.2/m4/gtk-doc.m4 --- libepc-0.3.11/m4/gtk-doc.m4 2010-03-23 13:08:16.000000000 +0000 +++ libepc-0.4.2/m4/gtk-doc.m4 2011-10-13 14:51:51.000000000 +0000 @@ -6,8 +6,15 @@ dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) AC_DEFUN([GTK_DOC_CHECK], [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + + dnl check for tools we added during development + AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + dnl for overriding the documentation installation directory AC_ARG_WITH([html-dir], AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, @@ -26,14 +33,35 @@ [PKG_CHECK_EXISTS([gtk-doc],, AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + fi fi AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) - AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) ]) diff -Nru libepc-0.3.11/m4/intltool.m4 libepc-0.4.2/m4/intltool.m4 --- libepc-0.3.11/m4/intltool.m4 2010-03-23 13:08:16.000000000 +0000 +++ libepc-0.4.2/m4/intltool.m4 2011-10-13 14:51:51.000000000 +0000 @@ -75,25 +75,25 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -AC_SUBST(INTLTOOL_DESKTOP_RULE) -AC_SUBST(INTLTOOL_DIRECTORY_RULE) -AC_SUBST(INTLTOOL_KEYS_RULE) -AC_SUBST(INTLTOOL_PROP_RULE) -AC_SUBST(INTLTOOL_OAF_RULE) -AC_SUBST(INTLTOOL_PONG_RULE) -AC_SUBST(INTLTOOL_SERVER_RULE) -AC_SUBST(INTLTOOL_SHEET_RULE) -AC_SUBST(INTLTOOL_SOUNDLIST_RULE) -AC_SUBST(INTLTOOL_UI_RULE) -AC_SUBST(INTLTOOL_XAM_RULE) -AC_SUBST(INTLTOOL_KBD_RULE) -AC_SUBST(INTLTOOL_XML_RULE) -AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) -AC_SUBST(INTLTOOL_CAVES_RULE) -AC_SUBST(INTLTOOL_SCHEMAS_RULE) -AC_SUBST(INTLTOOL_THEME_RULE) -AC_SUBST(INTLTOOL_SERVICE_RULE) -AC_SUBST(INTLTOOL_POLICY_RULE) +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) # Check the gettext tools to make sure they are GNU AC_PATH_PROG(XGETTEXT, xgettext) @@ -110,12 +110,17 @@ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) fi -AC_PATH_PROG(INTLTOOL_PERL, [perl]) +AC_PATH_PROG(INTLTOOL_PERL, perl) if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found; required for intltool]) + AC_MSG_ERROR([perl not found]) fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - AC_MSG_ERROR([perl 5.x required for intltool]) +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then AC_MSG_CHECKING([for XML::Parser]) @@ -167,11 +172,11 @@ AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl The following CONFIG_COMMANDS should be executed at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) fi rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" @@ -193,6 +198,17 @@ ])dnl ]) +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + # deprecated macros AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) # A hint is needed for aclocal from Automake <= 1.9.4: diff -Nru libepc-0.3.11/m4/libtool.m4 libepc-0.4.2/m4/libtool.m4 --- libepc-0.3.11/m4/libtool.m4 2010-03-23 13:08:15.000000000 +0000 +++ libepc-0.4.2/m4/libtool.m4 2011-10-13 14:51:51.000000000 +0000 @@ -1,7 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,7 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -37,7 +39,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 56 LT_INIT +# serial 57 LT_INIT # LT_PREREQ(VERSION) @@ -66,6 +68,7 @@ # ------------------ AC_DEFUN([LT_INIT], [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl AC_BEFORE([$0], [LTDL_INIT])dnl @@ -82,6 +85,8 @@ AC_REQUIRE([LTOBSOLETE_VERSION])dnl m4_require([_LT_PROG_LTMAIN])dnl +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) @@ -118,7 +123,7 @@ *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ]) @@ -138,6 +143,9 @@ m4_defun([_LT_SETUP], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -160,10 +168,13 @@ dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl _LT_CONFIG_LIBTOOL_INIT([ # See if we are running on zsh, and set the options which allow our @@ -179,7 +190,6 @@ _LT_CHECK_OBJDIR m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -193,23 +203,6 @@ ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -250,6 +243,28 @@ ])# _LT_SETUP +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + # _LT_PROG_LTMAIN # --------------- # Note that this code is called both from `configure', and `config.status' @@ -408,7 +423,7 @@ # declaration there will have the same value as in `configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) # _LT_CONFIG_STATUS_DECLARATIONS @@ -418,7 +433,7 @@ # embedded single quotes properly. In configure, this macro expands # each variable declared with _LT_DECL (and _LT_TAGDECL) into: # -# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) @@ -517,12 +532,20 @@ LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + # Quote evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -533,9 +556,9 @@ # Double-quote double-evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -543,16 +566,38 @@ esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - _LT_OUTPUT_LIBTOOL_INIT ]) +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# `#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test $lt_write_fail = 0 && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT # --------- @@ -562,20 +607,11 @@ AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt} AC_MSG_NOTICE([creating $CONFIG_LT]) -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) cat >>"$CONFIG_LT" <<\_LTEOF -AS_SHELL_SANITIZE -_AS_PREPARE - -exec AS_MESSAGE_FD>&1 +lt_cl_silent=false exec AS_MESSAGE_LOG_FD>>config.log { echo @@ -601,7 +637,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -646,15 +682,13 @@ # appending to config.log, which fails on DOS, as config.log is still kept # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. -if test "$no_create" != yes; then - lt_cl_success=: - test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false - exec AS_MESSAGE_LOG_FD>>config.log - $lt_cl_success || AS_EXIT(1) -fi +lt_cl_success=: +test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) ])# LT_OUTPUT @@ -717,15 +751,12 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - _LT_PROG_XSI_SHELLFNS + _LT_PROG_REPLACE_SHELLFNS - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" ], @@ -831,11 +862,13 @@ AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AC_LIBTOOL_CXX], []) dnl AC_DEFUN([AC_LIBTOOL_F77], []) dnl AC_DEFUN([AC_LIBTOOL_FC], []) dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) # _LT_TAG_COMPILER @@ -940,6 +973,31 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) case $host_os in rhapsody* | darwin1.[[012]]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -967,7 +1025,7 @@ else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -987,7 +1045,11 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(whole_archive_flag_spec, $1)='' + if test "$lt_cv_ld_force_load" = "yes"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" case $cc_basename in @@ -995,7 +1057,7 @@ *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -1011,203 +1073,142 @@ fi ]) -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- # Links a minimal program and checks the executable # for the system default hardcoded library path. In most cases, # this is /usr/lib:/lib, but when the MPI compilers are used # the location of the communication and MPI libs are included too. # If we don't find anything, use the default library path according # to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi ])# _LT_SYS_MODULE_PATH_AIX # _LT_SHELL_INIT(ARG) # ------------------- m4_define([_LT_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_SHELL_INIT +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + # _LT_PROG_ECHO_BACKSLASH # ----------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], -[_LT_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -[$]* -_LT_EOF - exit 0 + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi +case "$ECHO" in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) -AC_SUBST(lt_ECHO) -]) _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], - [An echo program that does not interpret backslashes]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) ])# _LT_PROG_ECHO_BACKSLASH +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[ --with-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and in which our libraries should be installed.])]) + # _LT_ENABLE_LOCK # --------------- m4_defun([_LT_ENABLE_LOCK], @@ -1236,7 +1237,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -1354,14 +1355,47 @@ ])# _LT_ENABLE_LOCK +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + # _LT_CMD_OLD_ARCHIVE # ------------------- m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) +[_LT_PROG_AR AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: @@ -1388,10 +1422,19 @@ esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac _LT_DECL([], [old_postinstall_cmds], [2]) _LT_DECL([], [old_postuninstall_cmds], [2]) _LT_TAGDECL([], [old_archive_cmds], [2], [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) ])# _LT_CMD_OLD_ARCHIVE @@ -1416,15 +1459,15 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1464,7 +1507,7 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1527,6 +1570,11 @@ lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -1591,8 +1639,8 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -1643,7 +1691,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -[#line __oline__ "configure" +[#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -1684,7 +1732,13 @@ # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -1693,7 +1747,11 @@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -1869,16 +1927,16 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes @@ -2037,6 +2095,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ @@ -2045,16 +2104,23 @@ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -2067,7 +2133,7 @@ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -2087,7 +2153,13 @@ if (lt_foo != "") { lt_freq[[lt_foo]]++; } if (lt_freq[[lt_foo]] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) @@ -2175,7 +2247,7 @@ m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -2206,8 +2278,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -2228,36 +2301,83 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -2301,14 +2421,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + 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}' @@ -2319,12 +2432,6 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -2354,6 +2461,20 @@ 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 + ;; + +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2399,8 +2520,10 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[[3-9]]*) @@ -2458,7 +2581,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 @@ -2467,16 +2590,21 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -2485,7 +2613,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -2498,6 +2626,18 @@ 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 @@ -2718,6 +2858,8 @@ The last name is the one that the linker finds with -lNAME]]) _LT_DECL([], [soname_spec], [1], [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) _LT_DECL([], [postinstall_cmds], [2], [Command to use after installation of a shared archive]) _LT_DECL([], [postuninstall_cmds], [2], @@ -2830,6 +2972,7 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], @@ -2951,6 +3094,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -2959,8 +3107,8 @@ fi ;; esac -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl -_LT_DECL([], [reload_cmds], [2])dnl +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl +_LT_TAGDECL([], [reload_cmds], [2])dnl ])# _LT_CMD_RELOAD @@ -3012,16 +3160,18 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -3051,6 +3201,10 @@ lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -3059,11 +3213,11 @@ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -3085,11 +3239,11 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +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 @@ -3163,6 +3317,21 @@ ;; esac ]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -3170,7 +3339,11 @@ _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method == "file_magic"]) + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) ])# _LT_CHECK_MAGIC_METHOD @@ -3227,7 +3400,19 @@ NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi AC_SUBST([DUMPBIN]) if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -3240,13 +3425,13 @@ AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], [lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) cat conftest.out >&AS_MESSAGE_LOG_FD if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -3261,18 +3446,79 @@ dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + + +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; @@ -3297,7 +3543,12 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], lt_cv_prog_compiler_rtti_exceptions, @@ -3314,6 +3565,7 @@ m4_defun([_LT_CMD_GLOBAL_SYMBOLS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([LT_PATH_NM])dnl AC_REQUIRE([LT_PATH_LD])dnl m4_require([_LT_DECL_SED])dnl @@ -3381,8 +3633,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3418,6 +3670,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -3439,7 +3692,7 @@ if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -3451,6 +3704,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -3462,7 +3727,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT@&t@_DLSYM_CONST struct { const char *name; void *address; } @@ -3488,15 +3753,15 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi @@ -3529,6 +3794,13 @@ AC_MSG_RESULT(ok) fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], @@ -3539,6 +3811,8 @@ _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3550,7 +3824,6 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= -AC_MSG_CHECKING([for $compiler option to produce PIC]) m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -3601,6 +3874,11 @@ # DJGPP does not support shared libraries at all _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -3650,6 +3928,12 @@ ;; esac ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; dgux*) case $cc_basename in ec++*) @@ -3706,7 +3990,7 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -3739,8 +4023,8 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' @@ -3770,7 +4054,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -3802,7 +4086,7 @@ ;; solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -3906,6 +4190,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -3948,6 +4238,13 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -3990,7 +4287,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4011,7 +4308,13 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4023,25 +4326,25 @@ # All Alpha code is PIC. _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 + *Sun\ F* | *Sun*Fortran*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker + *Sun\ C*) + # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; esac ;; @@ -4073,7 +4376,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; *) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; @@ -4130,9 +4433,11 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) # # Check to make sure the PIC flag actually works. @@ -4151,6 +4456,8 @@ _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) # # Check to make sure the static flag actually works. # @@ -4171,6 +4478,7 @@ m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl @@ -4179,27 +4487,38 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi ;; pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; + case $cc_basename in + cl*) ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + linux* | k*bsd*-gnu | 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)= @@ -4259,10 +4578,39 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -4280,6 +4628,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -4295,11 +4644,12 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -4335,10 +4685,12 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -4356,6 +4708,11 @@ fi ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4371,7 +4728,7 @@ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -4381,15 +4738,16 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4400,13 +4758,17 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -4422,17 +4784,17 @@ fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4441,13 +4803,13 @@ fi ;; - netbsd*) + 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' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4465,8 +4827,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4512,8 +4874,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4553,8 +4915,10 @@ else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -4616,6 +4980,7 @@ 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 @@ -4641,9 +5006,9 @@ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -4652,14 +5017,19 @@ else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -4691,20 +5061,63 @@ # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac ;; darwin* | rhapsody*) @@ -4742,7 +5155,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4750,7 +5163,7 @@ hpux9*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -4765,8 +5178,8 @@ ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -4784,16 +5197,16 @@ ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -4805,7 +5218,14 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi @@ -4833,19 +5253,34 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS="$save_LDFLAGS"]) + if test "$lt_cv_irix_exported_symbol" = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -4854,7 +5289,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + 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 @@ -4907,17 +5342,17 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -4927,13 +5362,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -4946,9 +5381,9 @@ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -5124,36 +5559,38 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) ;; esac fi @@ -5218,8 +5655,6 @@ to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], @@ -5230,6 +5665,8 @@ [Symbols that must always be exported]) _LT_TAGDECL([], [prelink_cmds], [2], [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) _LT_TAGDECL([], [file_list_spec], [1], [Specify filename containing input files]) dnl FIXME: Not yet implemented @@ -5323,37 +5760,22 @@ ])# _LT_LANG_C_CONFIG -# _LT_PROG_CXX -# ------------ -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -# compiler, we have our own version here. -m4_defun([_LT_PROG_CXX], -[ -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -AC_PROG_CXX -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_CXX - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_CXX], []) - - # _LT_LANG_CXX_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write # the compiler configuration to `libtool'. m4_defun([_LT_LANG_CXX_CONFIG], -[AC_REQUIRE([_LT_PROG_CXX])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi AC_LANG_PUSH(C++) _LT_TAGVAR(archive_cmds_need_lc, $1)=no @@ -5375,6 +5797,8 @@ _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -5406,6 +5830,7 @@ # Allow CC to be a program name with arguments. lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -5423,6 +5848,7 @@ fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -5444,8 +5870,8 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5477,7 +5903,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -5586,10 +6012,10 @@ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -5598,14 +6024,19 @@ else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -5635,28 +6066,75 @@ ;; cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; @@ -5698,6 +6176,11 @@ gnu*) ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + hpux9*) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: @@ -5722,11 +6205,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -5787,7 +6270,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -5797,10 +6280,10 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -5830,7 +6313,7 @@ case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -5841,9 +6324,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -5854,7 +6337,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -5872,7 +6355,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5909,26 +6392,26 @@ pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -5936,7 +6419,7 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -5955,9 +6438,9 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; - xl*) + xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5977,13 +6460,13 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6052,7 +6535,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6087,15 +6570,15 @@ case $host in osf3*) _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; @@ -6111,17 +6594,17 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -6131,7 +6614,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -6167,7 +6650,7 @@ solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -6188,7 +6671,7 @@ esac _LT_TAGVAR(link_all_deplibs, $1)=yes - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6208,14 +6691,14 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -6226,7 +6709,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' @@ -6280,6 +6763,10 @@ CC*) _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -6335,6 +6822,7 @@ fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -6349,6 +6837,29 @@ ])# _LT_LANG_CXX_CONFIG +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -6357,6 +6868,7 @@ # objects, libraries and library flags. m4_defun([_LT_SYS_HIDDEN_LIBDEPS], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl # Dependencies to place before and after the object being linked: _LT_TAGVAR(predep_objects, $1)= _LT_TAGVAR(postdep_objects, $1)= @@ -6407,6 +6919,13 @@ }; _LT_EOF ]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +esac + dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then @@ -6418,7 +6937,7 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -6427,13 +6946,22 @@ test $p = "-R"; then prev=$p continue - else - prev= fi + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) + case ${prev} in + -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -6453,8 +6981,10 @@ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi + prev= ;; + *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -6490,6 +7020,7 @@ fi $RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], @@ -6526,7 +7057,7 @@ solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -6570,32 +7101,16 @@ ])# _LT_SYS_HIDDEN_LIBDEPS -# _LT_PROG_F77 -# ------------ -# Since AC_PROG_F77 is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_F77], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -AC_PROG_F77 -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_F77 - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_F77], []) - - # _LT_LANG_F77_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_F77_CONFIG], -[AC_REQUIRE([_LT_PROG_F77])dnl -AC_LANG_PUSH(Fortran 77) +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6614,6 +7129,8 @@ _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -6653,7 +7170,9 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} + CFLAGS=$FFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -6707,38 +7226,24 @@ GCC=$lt_save_GCC CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" fi # test "$_lt_disable_F77" != yes AC_LANG_POP ])# _LT_LANG_F77_CONFIG -# _LT_PROG_FC -# ----------- -# Since AC_PROG_FC is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_FC], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -AC_PROG_FC -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_FC - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_FC], []) - - # _LT_LANG_FC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_FC_CONFIG], -[AC_REQUIRE([_LT_PROG_FC])dnl -AC_LANG_PUSH(Fortran) +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6757,6 +7262,8 @@ _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -6796,7 +7303,9 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} + CFLAGS=$FCFLAGS compiler=$CC GCC=$ac_cv_fc_compiler_gnu @@ -6852,7 +7361,8 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS fi # test "$_lt_disable_FC" != yes AC_LANG_POP @@ -6889,10 +7399,12 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC=yes CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(LD, $1)="$LD" @@ -6902,6 +7414,8 @@ _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6921,7 +7435,8 @@ AC_LANG_RESTORE GCC=$lt_save_GCC -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG @@ -6956,9 +7471,11 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= CC=${RC-"windres"} +CFLAGS= compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -6971,7 +7488,8 @@ GCC=$lt_save_GCC AC_LANG_RESTORE -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_RC_CONFIG @@ -7030,6 +7548,15 @@ AC_SUBST([OBJDUMP]) ]) +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) # _LT_DECL_SED # ------------ @@ -7123,8 +7650,8 @@ # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -7163,208 +7690,162 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- +# Replace existing portable implementations of several shell functions with +# equivalent extended shell implementations where those features are available.. +m4_defun([_LT_PROG_REPLACE_SHELLFNS], +[if test x"$xsi_shell" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}"]) -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` -} +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi -_LT_EOF -esac +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac ;; - esac + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac ]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS diff -Nru libepc-0.3.11/m4/lt~obsolete.m4 libepc-0.4.2/m4/lt~obsolete.m4 --- libepc-0.3.11/m4/lt~obsolete.m4 2010-03-23 13:08:15.000000000 +0000 +++ libepc-0.4.2/m4/lt~obsolete.m4 2011-10-13 14:51:51.000000000 +0000 @@ -1,13 +1,13 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 4 lt~obsolete.m4 +# serial 5 lt~obsolete.m4 # These exist entirely to fool aclocal when bootstrapping libtool. # @@ -77,7 +77,6 @@ m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) @@ -90,3 +89,10 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff -Nru libepc-0.3.11/m4/ltoptions.m4 libepc-0.4.2/m4/ltoptions.m4 --- libepc-0.3.11/m4/ltoptions.m4 2010-03-23 13:08:15.000000000 +0000 +++ libepc-0.4.2/m4/ltoptions.m4 2011-10-13 14:51:51.000000000 +0000 @@ -1,13 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 6 ltoptions.m4 +# serial 7 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -125,7 +126,7 @@ [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -133,13 +134,13 @@ esac test -z "$AS" && AS=as -_LT_DECL([], [AS], [0], [Assembler program])dnl +_LT_DECL([], [AS], [1], [Assembler program])dnl test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl ])# win32-dll AU_DEFUN([AC_LIBTOOL_WIN32_DLL], diff -Nru libepc-0.3.11/m4/ltversion.m4 libepc-0.4.2/m4/ltversion.m4 --- libepc-0.3.11/m4/ltversion.m4 2010-03-23 13:08:15.000000000 +0000 +++ libepc-0.4.2/m4/ltversion.m4 2011-10-13 14:51:51.000000000 +0000 @@ -7,17 +7,17 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# Generated from ltversion.in. +# @configure_input@ -# serial 3017 ltversion.m4 +# serial 3293 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -m4_define([LT_PACKAGE_REVISION], [1.3017]) +m4_define([LT_PACKAGE_VERSION], [2.4]) +m4_define([LT_PACKAGE_REVISION], [1.3293]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6b' -macro_revision='1.3017' +[macro_version='2.4' +macro_revision='1.3293' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru libepc-0.3.11/Makefile.am libepc-0.4.2/Makefile.am --- libepc-0.3.11/Makefile.am 2010-03-23 11:07:57.000000000 +0000 +++ libepc-0.4.2/Makefile.am 2011-10-12 16:22:58.000000000 +0000 @@ -134,6 +134,11 @@ -DLOCALEDIR=\"$(localedir)\" \ -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" +example_epc_cflags = $(AM_CFLAGS) $(LIBEPC_CFLAGS) +example_epc_libs = libepc/libepc-1.0.la $(LIBEPC_LIBS) +example_epc_ui_cflags = $(example_epc_cflags) $(LIBEPC_UI_CFLAGS) +example_epc_ui_libs = $(example_epc_libs) libepc-ui/libepc-ui-1.0.la $(LIBEPC_UI_LIBS) + libepc_libepc_1_0_la_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -DG_LOG_DOMAIN=\"libepc\" libepc_libepc_1_0_la_LDFLAGS = $(LIBEPC_LIBS) -version-info $(LT_VERSION_INFO) @@ -141,56 +146,60 @@ libepc_ui_libepc_ui_1_0_la_LDFLAGS = $(LIBEPC_UI_LIBS) -version-info $(LT_VERSION_INFO) libepc_ui_libepc_ui_1_0_la_LIBADD = libepc/libepc-1.0.la -examples_list_resources_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -examples_list_resources_LDADD = libepc/libepc-1.0.la $(LIBEPC_LIBS) -examples_lookup_resource_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -examples_lookup_resource_LDADD = libepc/libepc-1.0.la $(LIBEPC_LIBS) -examples_service_browser_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -examples_service_browser_LDADD = libepc/libepc-1.0.la -examples_simple_publisher_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -examples_simple_publisher_LDADD = libepc/libepc-1.0.la $(LIBEPC_LIBS) - -examples_consumer_ui_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS) $(AVAHI_UI_CFLAGS) -examples_consumer_ui_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(AVAHI_UI_LIBS) $(LIBEPC_LIBS) -examples_publisher_ui_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS) $(AVAHI_UI_CFLAGS) -rdynamic -examples_publisher_ui_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(AVAHI_UI_LIBS) $(LIBEPC_LIBS) -examples_server_credentials_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS) -examples_server_credentials_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(LIBEPC_LIBS) - -tests_libepc_tests_la_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) - -tests_test_consumer_by_info_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_consumer_by_info_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_consumer_by_name_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_consumer_by_name_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_local_collision_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_local_collision_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_multiple_services_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_multiple_services_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_rename_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_rename_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_reset_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_reset_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_simple_service_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_simple_service_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_subtypes_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_subtypes_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_unique_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_unique_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_expand_name_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_expand_name_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_progress_hooks_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS) -tests_test_progress_hooks_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_publisher_bookmarks_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_publisher_bookmarks_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_publisher_change_name_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_publisher_change_name_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_publisher_libsoup_494128_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_publisher_libsoup_494128_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_publisher_unique_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_publisher_unique_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_service_type_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_service_type_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) +examples_list_resources_CFLAGS = $(example_epc_cflags) +examples_list_resources_LDADD = $(example_epc_libs) +examples_lookup_resource_CFLAGS = $(example_epc_cflags) +examples_lookup_resource_LDADD = $(example_epc_libs) +examples_service_browser_CFLAGS = $(example_epc_cflags) +examples_service_browser_LDADD = $(example_epc_libs) +examples_simple_publisher_CFLAGS = $(example_epc_cflags) +examples_simple_publisher_LDADD = $(example_epc_libs) + +examples_consumer_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) +examples_consumer_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) +examples_publisher_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) -rdynamic +examples_publisher_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) +examples_server_credentials_CFLAGS = $(example_epc_ui_cflags) +examples_server_credentials_LDADD = $(example_epc_ui_libs) + + +test_epc_libs = tests/libepc-tests.la $(example_epc_libs) +test_epc_ui_libs = tests/libepc-tests.la $(example_epc_ui_libs) + +tests_libepc_tests_la_CFLAGS = $(example_epc_cflags) + +tests_test_consumer_by_info_CFLAGS = $(example_epc_cflags) +tests_test_consumer_by_info_LDADD = $(test_epc_libs) +tests_test_consumer_by_name_CFLAGS = $(example_epc_cflags) +tests_test_consumer_by_name_LDADD = $(test_epc_libs) +tests_test_dispatcher_local_collision_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_local_collision_LDADD = $(test_epc_libs) +tests_test_dispatcher_multiple_services_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_multiple_services_LDADD = $(test_epc_libs) +tests_test_dispatcher_rename_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_rename_LDADD = $(test_epc_libs) +tests_test_dispatcher_reset_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_reset_LDADD = $(test_epc_libs) +tests_test_dispatcher_simple_service_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_simple_service_LDADD = $(test_epc_libs) +tests_test_dispatcher_subtypes_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_subtypes_LDADD = $(test_epc_libs) +tests_test_dispatcher_unique_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_unique_LDADD = $(test_epc_libs) +tests_test_expand_name_CFLAGS = $(example_epc_cflags) +tests_test_expand_name_LDADD = $(test_epc_libs) +tests_test_progress_hooks_CFLAGS = $(example_epc_ui_cflags) +tests_test_progress_hooks_LDADD = $(test_epc_ui_libs) +tests_test_publisher_bookmarks_CFLAGS = $(example_epc_cflags) +tests_test_publisher_bookmarks_LDADD = $(test_epc_libs) +tests_test_publisher_change_name_CFLAGS = $(example_epc_cflags) +tests_test_publisher_change_name_LDADD = $(test_epc_libs) +tests_test_publisher_libsoup_494128_CFLAGS = $(example_epc_cflags) +tests_test_publisher_libsoup_494128_LDADD = $(test_epc_libs) +tests_test_publisher_unique_CFLAGS = $(example_epc_cflags) +tests_test_publisher_unique_LDADD = $(test_epc_libs) +tests_test_service_type_CFLAGS = $(example_epc_cflags) +tests_test_service_type_LDADD = $(test_epc_libs) # ================== # -- CUSTOM RULES -- diff -Nru libepc-0.3.11/Makefile.in libepc-0.4.2/Makefile.in --- libepc-0.3.11/Makefile.in 2010-03-23 13:08:19.000000000 +0000 +++ libepc-0.4.2/Makefile.in 2011-10-13 14:51:55.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.3 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, @@ -25,8 +25,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -85,16 +86,31 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = libepc-1.0.pc libepc-ui-1.0.pc +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)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(libepc_includedir)" \ "$(DESTDIR)$(libepc_ui_includedir)" -libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) libepc_ui_libepc_ui_1_0_la_DEPENDENCIES = libepc/libepc-1.0.la am__objects_1 = @@ -157,8 +173,10 @@ examples_consumer_ui_OBJECTS = \ examples/examples_consumer_ui-consumer-ui.$(OBJEXT) am__DEPENDENCIES_1 = -examples_consumer_ui_DEPENDENCIES = libepc/libepc-1.0.la \ - libepc-ui/libepc-ui-1.0.la $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_2 = libepc/libepc-1.0.la $(am__DEPENDENCIES_1) +am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) libepc-ui/libepc-ui-1.0.la \ + $(am__DEPENDENCIES_1) +examples_consumer_ui_DEPENDENCIES = $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_1) examples_consumer_ui_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -167,8 +185,7 @@ examples_list_resources_SOURCES = examples/list-resources.c examples_list_resources_OBJECTS = \ examples/examples_list_resources-list-resources.$(OBJEXT) -examples_list_resources_DEPENDENCIES = libepc/libepc-1.0.la \ - $(am__DEPENDENCIES_1) +examples_list_resources_DEPENDENCIES = $(am__DEPENDENCIES_2) examples_list_resources_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(examples_list_resources_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -176,8 +193,7 @@ examples_lookup_resource_SOURCES = examples/lookup-resource.c examples_lookup_resource_OBJECTS = \ examples/examples_lookup_resource-lookup-resource.$(OBJEXT) -examples_lookup_resource_DEPENDENCIES = libepc/libepc-1.0.la \ - $(am__DEPENDENCIES_1) +examples_lookup_resource_DEPENDENCIES = $(am__DEPENDENCIES_2) examples_lookup_resource_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(examples_lookup_resource_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -185,8 +201,7 @@ examples_publisher_ui_SOURCES = examples/publisher-ui.c examples_publisher_ui_OBJECTS = \ examples/examples_publisher_ui-publisher-ui.$(OBJEXT) -examples_publisher_ui_DEPENDENCIES = libepc/libepc-1.0.la \ - libepc-ui/libepc-ui-1.0.la $(am__DEPENDENCIES_1) \ +examples_publisher_ui_DEPENDENCIES = $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_1) examples_publisher_ui_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -194,8 +209,7 @@ $(LDFLAGS) -o $@ examples_server_credentials_SOURCES = examples/server-credentials.c examples_server_credentials_OBJECTS = examples/examples_server_credentials-server-credentials.$(OBJEXT) -examples_server_credentials_DEPENDENCIES = libepc/libepc-1.0.la \ - libepc-ui/libepc-ui-1.0.la $(am__DEPENDENCIES_1) +examples_server_credentials_DEPENDENCIES = $(am__DEPENDENCIES_3) examples_server_credentials_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(examples_server_credentials_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -203,7 +217,7 @@ examples_service_browser_SOURCES = examples/service-browser.c examples_service_browser_OBJECTS = \ examples/examples_service_browser-service-browser.$(OBJEXT) -examples_service_browser_DEPENDENCIES = libepc/libepc-1.0.la +examples_service_browser_DEPENDENCIES = $(am__DEPENDENCIES_2) examples_service_browser_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(examples_service_browser_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -211,24 +225,22 @@ examples_simple_publisher_SOURCES = examples/simple-publisher.c examples_simple_publisher_OBJECTS = \ examples/examples_simple_publisher-simple-publisher.$(OBJEXT) -examples_simple_publisher_DEPENDENCIES = libepc/libepc-1.0.la \ - $(am__DEPENDENCIES_1) +examples_simple_publisher_DEPENDENCIES = $(am__DEPENDENCIES_2) examples_simple_publisher_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(examples_simple_publisher_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ tests_test_consumer_by_info_SOURCES = tests/test-consumer-by-info.c tests_test_consumer_by_info_OBJECTS = tests/tests_test_consumer_by_info-test-consumer-by-info.$(OBJEXT) -tests_test_consumer_by_info_DEPENDENCIES = libepc/libepc-1.0.la \ - tests/libepc-tests.la $(am__DEPENDENCIES_1) +am__DEPENDENCIES_4 = tests/libepc-tests.la $(am__DEPENDENCIES_2) +tests_test_consumer_by_info_DEPENDENCIES = $(am__DEPENDENCIES_4) tests_test_consumer_by_info_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_consumer_by_info_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ tests_test_consumer_by_name_SOURCES = tests/test-consumer-by-name.c tests_test_consumer_by_name_OBJECTS = tests/tests_test_consumer_by_name-test-consumer-by-name.$(OBJEXT) -tests_test_consumer_by_name_DEPENDENCIES = libepc/libepc-1.0.la \ - tests/libepc-tests.la $(am__DEPENDENCIES_1) +tests_test_consumer_by_name_DEPENDENCIES = $(am__DEPENDENCIES_4) tests_test_consumer_by_name_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_consumer_by_name_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -237,8 +249,7 @@ tests/test-dispatcher-local-collision.c tests_test_dispatcher_local_collision_OBJECTS = tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.$(OBJEXT) tests_test_dispatcher_local_collision_DEPENDENCIES = \ - libepc/libepc-1.0.la tests/libepc-tests.la \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_4) tests_test_dispatcher_local_collision_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_dispatcher_local_collision_CFLAGS) $(CFLAGS) \ @@ -247,24 +258,21 @@ tests/test-dispatcher-multiple-services.c tests_test_dispatcher_multiple_services_OBJECTS = tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.$(OBJEXT) tests_test_dispatcher_multiple_services_DEPENDENCIES = \ - libepc/libepc-1.0.la tests/libepc-tests.la \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_4) tests_test_dispatcher_multiple_services_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_dispatcher_multiple_services_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ tests_test_dispatcher_rename_SOURCES = tests/test-dispatcher-rename.c tests_test_dispatcher_rename_OBJECTS = tests/tests_test_dispatcher_rename-test-dispatcher-rename.$(OBJEXT) -tests_test_dispatcher_rename_DEPENDENCIES = libepc/libepc-1.0.la \ - tests/libepc-tests.la $(am__DEPENDENCIES_1) +tests_test_dispatcher_rename_DEPENDENCIES = $(am__DEPENDENCIES_4) tests_test_dispatcher_rename_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_dispatcher_rename_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ tests_test_dispatcher_reset_SOURCES = tests/test-dispatcher-reset.c tests_test_dispatcher_reset_OBJECTS = tests/tests_test_dispatcher_reset-test-dispatcher-reset.$(OBJEXT) -tests_test_dispatcher_reset_DEPENDENCIES = libepc/libepc-1.0.la \ - tests/libepc-tests.la $(am__DEPENDENCIES_1) +tests_test_dispatcher_reset_DEPENDENCIES = $(am__DEPENDENCIES_4) tests_test_dispatcher_reset_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_dispatcher_reset_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -273,8 +281,7 @@ tests/test-dispatcher-simple-service.c tests_test_dispatcher_simple_service_OBJECTS = tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.$(OBJEXT) tests_test_dispatcher_simple_service_DEPENDENCIES = \ - libepc/libepc-1.0.la tests/libepc-tests.la \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_4) tests_test_dispatcher_simple_service_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_dispatcher_simple_service_CFLAGS) $(CFLAGS) \ @@ -282,16 +289,14 @@ tests_test_dispatcher_subtypes_SOURCES = \ tests/test-dispatcher-subtypes.c tests_test_dispatcher_subtypes_OBJECTS = tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.$(OBJEXT) -tests_test_dispatcher_subtypes_DEPENDENCIES = libepc/libepc-1.0.la \ - tests/libepc-tests.la $(am__DEPENDENCIES_1) +tests_test_dispatcher_subtypes_DEPENDENCIES = $(am__DEPENDENCIES_4) tests_test_dispatcher_subtypes_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_dispatcher_subtypes_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ tests_test_dispatcher_unique_SOURCES = tests/test-dispatcher-unique.c tests_test_dispatcher_unique_OBJECTS = tests/tests_test_dispatcher_unique-test-dispatcher-unique.$(OBJEXT) -tests_test_dispatcher_unique_DEPENDENCIES = libepc/libepc-1.0.la \ - tests/libepc-tests.la $(am__DEPENDENCIES_1) +tests_test_dispatcher_unique_DEPENDENCIES = $(am__DEPENDENCIES_4) tests_test_dispatcher_unique_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_dispatcher_unique_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -299,8 +304,7 @@ tests_test_expand_name_SOURCES = tests/test-expand-name.c tests_test_expand_name_OBJECTS = \ tests/tests_test_expand_name-test-expand-name.$(OBJEXT) -tests_test_expand_name_DEPENDENCIES = libepc/libepc-1.0.la \ - tests/libepc-tests.la $(am__DEPENDENCIES_1) +tests_test_expand_name_DEPENDENCIES = $(am__DEPENDENCIES_4) tests_test_expand_name_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_expand_name_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -308,9 +312,8 @@ tests_test_progress_hooks_SOURCES = tests/test-progress-hooks.c tests_test_progress_hooks_OBJECTS = \ tests/tests_test_progress_hooks-test-progress-hooks.$(OBJEXT) -tests_test_progress_hooks_DEPENDENCIES = libepc/libepc-1.0.la \ - libepc-ui/libepc-ui-1.0.la tests/libepc-tests.la \ - $(am__DEPENDENCIES_1) +am__DEPENDENCIES_5 = tests/libepc-tests.la $(am__DEPENDENCIES_3) +tests_test_progress_hooks_DEPENDENCIES = $(am__DEPENDENCIES_5) tests_test_progress_hooks_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_progress_hooks_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -318,8 +321,7 @@ tests_test_publisher_bookmarks_SOURCES = \ tests/test-publisher-bookmarks.c tests_test_publisher_bookmarks_OBJECTS = tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.$(OBJEXT) -tests_test_publisher_bookmarks_DEPENDENCIES = libepc/libepc-1.0.la \ - tests/libepc-tests.la $(am__DEPENDENCIES_1) +tests_test_publisher_bookmarks_DEPENDENCIES = $(am__DEPENDENCIES_4) tests_test_publisher_bookmarks_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_publisher_bookmarks_CFLAGS) $(CFLAGS) \ @@ -327,8 +329,7 @@ tests_test_publisher_change_name_SOURCES = \ tests/test-publisher-change-name.c tests_test_publisher_change_name_OBJECTS = tests/tests_test_publisher_change_name-test-publisher-change-name.$(OBJEXT) -tests_test_publisher_change_name_DEPENDENCIES = libepc/libepc-1.0.la \ - tests/libepc-tests.la $(am__DEPENDENCIES_1) +tests_test_publisher_change_name_DEPENDENCIES = $(am__DEPENDENCIES_4) tests_test_publisher_change_name_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_publisher_change_name_CFLAGS) $(CFLAGS) \ @@ -337,16 +338,14 @@ tests/test-publisher-libsoup-494128.c tests_test_publisher_libsoup_494128_OBJECTS = tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.$(OBJEXT) tests_test_publisher_libsoup_494128_DEPENDENCIES = \ - libepc/libepc-1.0.la tests/libepc-tests.la \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_4) tests_test_publisher_libsoup_494128_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_publisher_libsoup_494128_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ tests_test_publisher_unique_SOURCES = tests/test-publisher-unique.c tests_test_publisher_unique_OBJECTS = tests/tests_test_publisher_unique-test-publisher-unique.$(OBJEXT) -tests_test_publisher_unique_DEPENDENCIES = libepc/libepc-1.0.la \ - tests/libepc-tests.la $(am__DEPENDENCIES_1) +tests_test_publisher_unique_DEPENDENCIES = $(am__DEPENDENCIES_4) tests_test_publisher_unique_LINK = $(LIBTOOL) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_publisher_unique_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -354,8 +353,7 @@ tests_test_service_type_SOURCES = tests/test-service-type.c tests_test_service_type_OBJECTS = \ tests/tests_test_service_type-test-service-type.$(OBJEXT) -tests_test_service_type_DEPENDENCIES = libepc/libepc-1.0.la \ - tests/libepc-tests.la $(am__DEPENDENCIES_1) +tests_test_service_type_DEPENDENCIES = $(am__DEPENDENCIES_4) tests_test_service_type_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(tests_test_service_type_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -364,6 +362,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -414,23 +413,50 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -pkgconfigDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_noinst_DATA) $(pkgconfig_DATA) -libepc_includeHEADERS_INSTALL = $(INSTALL_HEADER) -libepc_ui_includeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(libepc_include_HEADERS) $(libepc_ui_include_HEADERS) 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 +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 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 $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print @@ -458,6 +484,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -473,6 +500,10 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -481,29 +512,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ @@ -520,6 +532,7 @@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -536,9 +549,12 @@ 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@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -556,6 +572,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -588,7 +605,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -711,58 +727,64 @@ -DLOCALEDIR=\"$(localedir)\" \ -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" +example_epc_cflags = $(AM_CFLAGS) $(LIBEPC_CFLAGS) +example_epc_libs = libepc/libepc-1.0.la $(LIBEPC_LIBS) +example_epc_ui_cflags = $(example_epc_cflags) $(LIBEPC_UI_CFLAGS) +example_epc_ui_libs = $(example_epc_libs) libepc-ui/libepc-ui-1.0.la $(LIBEPC_UI_LIBS) libepc_libepc_1_0_la_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -DG_LOG_DOMAIN=\"libepc\" libepc_libepc_1_0_la_LDFLAGS = $(LIBEPC_LIBS) -version-info $(LT_VERSION_INFO) libepc_ui_libepc_ui_1_0_la_CFLAGS = $(AM_CFLAGS) $(LIBEPC_UI_CFLAGS) -DG_LOG_DOMAIN=\"libepc-ui\" libepc_ui_libepc_ui_1_0_la_LDFLAGS = $(LIBEPC_UI_LIBS) -version-info $(LT_VERSION_INFO) libepc_ui_libepc_ui_1_0_la_LIBADD = libepc/libepc-1.0.la -examples_list_resources_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -examples_list_resources_LDADD = libepc/libepc-1.0.la $(LIBEPC_LIBS) -examples_lookup_resource_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -examples_lookup_resource_LDADD = libepc/libepc-1.0.la $(LIBEPC_LIBS) -examples_service_browser_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -examples_service_browser_LDADD = libepc/libepc-1.0.la -examples_simple_publisher_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -examples_simple_publisher_LDADD = libepc/libepc-1.0.la $(LIBEPC_LIBS) -examples_consumer_ui_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS) $(AVAHI_UI_CFLAGS) -examples_consumer_ui_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(AVAHI_UI_LIBS) $(LIBEPC_LIBS) -examples_publisher_ui_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS) $(AVAHI_UI_CFLAGS) -rdynamic -examples_publisher_ui_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(AVAHI_UI_LIBS) $(LIBEPC_LIBS) -examples_server_credentials_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS) -examples_server_credentials_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(LIBEPC_LIBS) -tests_libepc_tests_la_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_consumer_by_info_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_consumer_by_info_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_consumer_by_name_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_consumer_by_name_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_local_collision_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_local_collision_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_multiple_services_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_multiple_services_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_rename_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_rename_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_reset_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_reset_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_simple_service_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_simple_service_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_subtypes_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_subtypes_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_dispatcher_unique_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_dispatcher_unique_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_expand_name_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_expand_name_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_progress_hooks_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS) -tests_test_progress_hooks_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_publisher_bookmarks_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_publisher_bookmarks_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_publisher_change_name_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_publisher_change_name_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_publisher_libsoup_494128_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_publisher_libsoup_494128_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_publisher_unique_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_publisher_unique_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) -tests_test_service_type_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -tests_test_service_type_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) +examples_list_resources_CFLAGS = $(example_epc_cflags) +examples_list_resources_LDADD = $(example_epc_libs) +examples_lookup_resource_CFLAGS = $(example_epc_cflags) +examples_lookup_resource_LDADD = $(example_epc_libs) +examples_service_browser_CFLAGS = $(example_epc_cflags) +examples_service_browser_LDADD = $(example_epc_libs) +examples_simple_publisher_CFLAGS = $(example_epc_cflags) +examples_simple_publisher_LDADD = $(example_epc_libs) +examples_consumer_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) +examples_consumer_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) +examples_publisher_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) -rdynamic +examples_publisher_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) +examples_server_credentials_CFLAGS = $(example_epc_ui_cflags) +examples_server_credentials_LDADD = $(example_epc_ui_libs) +test_epc_libs = tests/libepc-tests.la $(example_epc_libs) +test_epc_ui_libs = tests/libepc-tests.la $(example_epc_ui_libs) +tests_libepc_tests_la_CFLAGS = $(example_epc_cflags) +tests_test_consumer_by_info_CFLAGS = $(example_epc_cflags) +tests_test_consumer_by_info_LDADD = $(test_epc_libs) +tests_test_consumer_by_name_CFLAGS = $(example_epc_cflags) +tests_test_consumer_by_name_LDADD = $(test_epc_libs) +tests_test_dispatcher_local_collision_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_local_collision_LDADD = $(test_epc_libs) +tests_test_dispatcher_multiple_services_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_multiple_services_LDADD = $(test_epc_libs) +tests_test_dispatcher_rename_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_rename_LDADD = $(test_epc_libs) +tests_test_dispatcher_reset_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_reset_LDADD = $(test_epc_libs) +tests_test_dispatcher_simple_service_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_simple_service_LDADD = $(test_epc_libs) +tests_test_dispatcher_subtypes_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_subtypes_LDADD = $(test_epc_libs) +tests_test_dispatcher_unique_CFLAGS = $(example_epc_cflags) +tests_test_dispatcher_unique_LDADD = $(test_epc_libs) +tests_test_expand_name_CFLAGS = $(example_epc_cflags) +tests_test_expand_name_LDADD = $(test_epc_libs) +tests_test_progress_hooks_CFLAGS = $(example_epc_ui_cflags) +tests_test_progress_hooks_LDADD = $(test_epc_ui_libs) +tests_test_publisher_bookmarks_CFLAGS = $(example_epc_cflags) +tests_test_publisher_bookmarks_LDADD = $(test_epc_libs) +tests_test_publisher_change_name_CFLAGS = $(example_epc_cflags) +tests_test_publisher_change_name_LDADD = $(test_epc_libs) +tests_test_publisher_libsoup_494128_CFLAGS = $(example_epc_cflags) +tests_test_publisher_libsoup_494128_LDADD = $(test_epc_libs) +tests_test_publisher_unique_CFLAGS = $(example_epc_cflags) +tests_test_publisher_unique_LDADD = $(test_epc_libs) +tests_test_service_type_CFLAGS = $(example_epc_cflags) +tests_test_service_type_LDADD = $(test_epc_libs) SUBDIRS = po all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -775,15 +797,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 \ @@ -799,9 +821,10 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(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 \ @@ -813,7 +836,7 @@ @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -826,20 +849,24 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + 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) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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: @@ -915,11 +942,13 @@ $(tests_libepc_tests_la_LINK) $(tests_libepc_tests_la_OBJECTS) $(tests_libepc_tests_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + @list='$(noinst_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 examples/$(am__dirstamp): @$(MKDIR_P) examples @: > examples/$(am__dirstamp) @@ -1143,7 +1172,7 @@ .c.o: @am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.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 -o $@ $< @@ -1151,7 +1180,7 @@ .c.obj: @am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.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 -o $@ `$(CYGPATH_W) '$<'` @@ -1159,434 +1188,434 @@ .c.lo: @am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Plo +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.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 $@ $< libepc-ui/libepc_ui_libepc_ui_1_0_la-password-dialog.lo: libepc-ui/password-dialog.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_ui_libepc_ui_1_0_la_CFLAGS) $(CFLAGS) -MT libepc-ui/libepc_ui_libepc_ui_1_0_la-password-dialog.lo -MD -MP -MF libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-password-dialog.Tpo -c -o libepc-ui/libepc_ui_libepc_ui_1_0_la-password-dialog.lo `test -f 'libepc-ui/password-dialog.c' || echo '$(srcdir)/'`libepc-ui/password-dialog.c -@am__fastdepCC_TRUE@ mv -f libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-password-dialog.Tpo libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-password-dialog.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_ui_libepc_ui_1_0_la_CFLAGS) $(CFLAGS) -MT libepc-ui/libepc_ui_libepc_ui_1_0_la-password-dialog.lo -MD -MP -MF libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-password-dialog.Tpo -c -o libepc-ui/libepc_ui_libepc_ui_1_0_la-password-dialog.lo `test -f 'libepc-ui/password-dialog.c' || echo '$(srcdir)/'`libepc-ui/password-dialog.c +@am__fastdepCC_TRUE@ $(am__mv) libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-password-dialog.Tpo libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-password-dialog.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc-ui/password-dialog.c' object='libepc-ui/libepc_ui_libepc_ui_1_0_la-password-dialog.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_ui_libepc_ui_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc-ui/libepc_ui_libepc_ui_1_0_la-password-dialog.lo `test -f 'libepc-ui/password-dialog.c' || echo '$(srcdir)/'`libepc-ui/password-dialog.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_ui_libepc_ui_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc-ui/libepc_ui_libepc_ui_1_0_la-password-dialog.lo `test -f 'libepc-ui/password-dialog.c' || echo '$(srcdir)/'`libepc-ui/password-dialog.c libepc-ui/libepc_ui_libepc_ui_1_0_la-progress-window.lo: libepc-ui/progress-window.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_ui_libepc_ui_1_0_la_CFLAGS) $(CFLAGS) -MT libepc-ui/libepc_ui_libepc_ui_1_0_la-progress-window.lo -MD -MP -MF libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-progress-window.Tpo -c -o libepc-ui/libepc_ui_libepc_ui_1_0_la-progress-window.lo `test -f 'libepc-ui/progress-window.c' || echo '$(srcdir)/'`libepc-ui/progress-window.c -@am__fastdepCC_TRUE@ mv -f libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-progress-window.Tpo libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-progress-window.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_ui_libepc_ui_1_0_la_CFLAGS) $(CFLAGS) -MT libepc-ui/libepc_ui_libepc_ui_1_0_la-progress-window.lo -MD -MP -MF libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-progress-window.Tpo -c -o libepc-ui/libepc_ui_libepc_ui_1_0_la-progress-window.lo `test -f 'libepc-ui/progress-window.c' || echo '$(srcdir)/'`libepc-ui/progress-window.c +@am__fastdepCC_TRUE@ $(am__mv) libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-progress-window.Tpo libepc-ui/$(DEPDIR)/libepc_ui_libepc_ui_1_0_la-progress-window.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc-ui/progress-window.c' object='libepc-ui/libepc_ui_libepc_ui_1_0_la-progress-window.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_ui_libepc_ui_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc-ui/libepc_ui_libepc_ui_1_0_la-progress-window.lo `test -f 'libepc-ui/progress-window.c' || echo '$(srcdir)/'`libepc-ui/progress-window.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_ui_libepc_ui_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc-ui/libepc_ui_libepc_ui_1_0_la-progress-window.lo `test -f 'libepc-ui/progress-window.c' || echo '$(srcdir)/'`libepc-ui/progress-window.c libepc/libepc_libepc_1_0_la-consumer.lo: libepc/consumer.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-consumer.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-consumer.Tpo -c -o libepc/libepc_libepc_1_0_la-consumer.lo `test -f 'libepc/consumer.c' || echo '$(srcdir)/'`libepc/consumer.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-consumer.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-consumer.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-consumer.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-consumer.Tpo -c -o libepc/libepc_libepc_1_0_la-consumer.lo `test -f 'libepc/consumer.c' || echo '$(srcdir)/'`libepc/consumer.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-consumer.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-consumer.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/consumer.c' object='libepc/libepc_libepc_1_0_la-consumer.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-consumer.lo `test -f 'libepc/consumer.c' || echo '$(srcdir)/'`libepc/consumer.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-consumer.lo `test -f 'libepc/consumer.c' || echo '$(srcdir)/'`libepc/consumer.c libepc/libepc_libepc_1_0_la-contents.lo: libepc/contents.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-contents.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-contents.Tpo -c -o libepc/libepc_libepc_1_0_la-contents.lo `test -f 'libepc/contents.c' || echo '$(srcdir)/'`libepc/contents.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-contents.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-contents.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-contents.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-contents.Tpo -c -o libepc/libepc_libepc_1_0_la-contents.lo `test -f 'libepc/contents.c' || echo '$(srcdir)/'`libepc/contents.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-contents.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-contents.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/contents.c' object='libepc/libepc_libepc_1_0_la-contents.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-contents.lo `test -f 'libepc/contents.c' || echo '$(srcdir)/'`libepc/contents.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-contents.lo `test -f 'libepc/contents.c' || echo '$(srcdir)/'`libepc/contents.c libepc/libepc_libepc_1_0_la-dispatcher.lo: libepc/dispatcher.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-dispatcher.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-dispatcher.Tpo -c -o libepc/libepc_libepc_1_0_la-dispatcher.lo `test -f 'libepc/dispatcher.c' || echo '$(srcdir)/'`libepc/dispatcher.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-dispatcher.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-dispatcher.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-dispatcher.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-dispatcher.Tpo -c -o libepc/libepc_libepc_1_0_la-dispatcher.lo `test -f 'libepc/dispatcher.c' || echo '$(srcdir)/'`libepc/dispatcher.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-dispatcher.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-dispatcher.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/dispatcher.c' object='libepc/libepc_libepc_1_0_la-dispatcher.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-dispatcher.lo `test -f 'libepc/dispatcher.c' || echo '$(srcdir)/'`libepc/dispatcher.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-dispatcher.lo `test -f 'libepc/dispatcher.c' || echo '$(srcdir)/'`libepc/dispatcher.c libepc/libepc_libepc_1_0_la-enums.lo: libepc/enums.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-enums.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-enums.Tpo -c -o libepc/libepc_libepc_1_0_la-enums.lo `test -f 'libepc/enums.c' || echo '$(srcdir)/'`libepc/enums.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-enums.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-enums.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-enums.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-enums.Tpo -c -o libepc/libepc_libepc_1_0_la-enums.lo `test -f 'libepc/enums.c' || echo '$(srcdir)/'`libepc/enums.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-enums.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-enums.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/enums.c' object='libepc/libepc_libepc_1_0_la-enums.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-enums.lo `test -f 'libepc/enums.c' || echo '$(srcdir)/'`libepc/enums.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-enums.lo `test -f 'libepc/enums.c' || echo '$(srcdir)/'`libepc/enums.c libepc/libepc_libepc_1_0_la-marshal.lo: libepc/marshal.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-marshal.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-marshal.Tpo -c -o libepc/libepc_libepc_1_0_la-marshal.lo `test -f 'libepc/marshal.c' || echo '$(srcdir)/'`libepc/marshal.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-marshal.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-marshal.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-marshal.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-marshal.Tpo -c -o libepc/libepc_libepc_1_0_la-marshal.lo `test -f 'libepc/marshal.c' || echo '$(srcdir)/'`libepc/marshal.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-marshal.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-marshal.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/marshal.c' object='libepc/libepc_libepc_1_0_la-marshal.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-marshal.lo `test -f 'libepc/marshal.c' || echo '$(srcdir)/'`libepc/marshal.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-marshal.lo `test -f 'libepc/marshal.c' || echo '$(srcdir)/'`libepc/marshal.c libepc/libepc_libepc_1_0_la-protocol.lo: libepc/protocol.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-protocol.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-protocol.Tpo -c -o libepc/libepc_libepc_1_0_la-protocol.lo `test -f 'libepc/protocol.c' || echo '$(srcdir)/'`libepc/protocol.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-protocol.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-protocol.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-protocol.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-protocol.Tpo -c -o libepc/libepc_libepc_1_0_la-protocol.lo `test -f 'libepc/protocol.c' || echo '$(srcdir)/'`libepc/protocol.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-protocol.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-protocol.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/protocol.c' object='libepc/libepc_libepc_1_0_la-protocol.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-protocol.lo `test -f 'libepc/protocol.c' || echo '$(srcdir)/'`libepc/protocol.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-protocol.lo `test -f 'libepc/protocol.c' || echo '$(srcdir)/'`libepc/protocol.c libepc/libepc_libepc_1_0_la-publisher.lo: libepc/publisher.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-publisher.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-publisher.Tpo -c -o libepc/libepc_libepc_1_0_la-publisher.lo `test -f 'libepc/publisher.c' || echo '$(srcdir)/'`libepc/publisher.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-publisher.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-publisher.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-publisher.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-publisher.Tpo -c -o libepc/libepc_libepc_1_0_la-publisher.lo `test -f 'libepc/publisher.c' || echo '$(srcdir)/'`libepc/publisher.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-publisher.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-publisher.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/publisher.c' object='libepc/libepc_libepc_1_0_la-publisher.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-publisher.lo `test -f 'libepc/publisher.c' || echo '$(srcdir)/'`libepc/publisher.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-publisher.lo `test -f 'libepc/publisher.c' || echo '$(srcdir)/'`libepc/publisher.c libepc/libepc_libepc_1_0_la-service-info.lo: libepc/service-info.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-service-info.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-info.Tpo -c -o libepc/libepc_libepc_1_0_la-service-info.lo `test -f 'libepc/service-info.c' || echo '$(srcdir)/'`libepc/service-info.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-info.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-info.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-service-info.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-info.Tpo -c -o libepc/libepc_libepc_1_0_la-service-info.lo `test -f 'libepc/service-info.c' || echo '$(srcdir)/'`libepc/service-info.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-info.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-info.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/service-info.c' object='libepc/libepc_libepc_1_0_la-service-info.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-service-info.lo `test -f 'libepc/service-info.c' || echo '$(srcdir)/'`libepc/service-info.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-service-info.lo `test -f 'libepc/service-info.c' || echo '$(srcdir)/'`libepc/service-info.c libepc/libepc_libepc_1_0_la-service-monitor.lo: libepc/service-monitor.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-service-monitor.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-monitor.Tpo -c -o libepc/libepc_libepc_1_0_la-service-monitor.lo `test -f 'libepc/service-monitor.c' || echo '$(srcdir)/'`libepc/service-monitor.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-monitor.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-monitor.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-service-monitor.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-monitor.Tpo -c -o libepc/libepc_libepc_1_0_la-service-monitor.lo `test -f 'libepc/service-monitor.c' || echo '$(srcdir)/'`libepc/service-monitor.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-monitor.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-monitor.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/service-monitor.c' object='libepc/libepc_libepc_1_0_la-service-monitor.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-service-monitor.lo `test -f 'libepc/service-monitor.c' || echo '$(srcdir)/'`libepc/service-monitor.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-service-monitor.lo `test -f 'libepc/service-monitor.c' || echo '$(srcdir)/'`libepc/service-monitor.c libepc/libepc_libepc_1_0_la-service-type.lo: libepc/service-type.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-service-type.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-type.Tpo -c -o libepc/libepc_libepc_1_0_la-service-type.lo `test -f 'libepc/service-type.c' || echo '$(srcdir)/'`libepc/service-type.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-type.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-type.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-service-type.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-type.Tpo -c -o libepc/libepc_libepc_1_0_la-service-type.lo `test -f 'libepc/service-type.c' || echo '$(srcdir)/'`libepc/service-type.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-type.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-service-type.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/service-type.c' object='libepc/libepc_libepc_1_0_la-service-type.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-service-type.lo `test -f 'libepc/service-type.c' || echo '$(srcdir)/'`libepc/service-type.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-service-type.lo `test -f 'libepc/service-type.c' || echo '$(srcdir)/'`libepc/service-type.c libepc/libepc_libepc_1_0_la-shell.lo: libepc/shell.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-shell.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-shell.Tpo -c -o libepc/libepc_libepc_1_0_la-shell.lo `test -f 'libepc/shell.c' || echo '$(srcdir)/'`libepc/shell.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-shell.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-shell.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-shell.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-shell.Tpo -c -o libepc/libepc_libepc_1_0_la-shell.lo `test -f 'libepc/shell.c' || echo '$(srcdir)/'`libepc/shell.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-shell.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-shell.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/shell.c' object='libepc/libepc_libepc_1_0_la-shell.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-shell.lo `test -f 'libepc/shell.c' || echo '$(srcdir)/'`libepc/shell.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-shell.lo `test -f 'libepc/shell.c' || echo '$(srcdir)/'`libepc/shell.c libepc/libepc_libepc_1_0_la-tls.lo: libepc/tls.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-tls.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-tls.Tpo -c -o libepc/libepc_libepc_1_0_la-tls.lo `test -f 'libepc/tls.c' || echo '$(srcdir)/'`libepc/tls.c -@am__fastdepCC_TRUE@ mv -f libepc/$(DEPDIR)/libepc_libepc_1_0_la-tls.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-tls.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -MT libepc/libepc_libepc_1_0_la-tls.lo -MD -MP -MF libepc/$(DEPDIR)/libepc_libepc_1_0_la-tls.Tpo -c -o libepc/libepc_libepc_1_0_la-tls.lo `test -f 'libepc/tls.c' || echo '$(srcdir)/'`libepc/tls.c +@am__fastdepCC_TRUE@ $(am__mv) libepc/$(DEPDIR)/libepc_libepc_1_0_la-tls.Tpo libepc/$(DEPDIR)/libepc_libepc_1_0_la-tls.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libepc/tls.c' object='libepc/libepc_libepc_1_0_la-tls.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-tls.lo `test -f 'libepc/tls.c' || echo '$(srcdir)/'`libepc/tls.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) -c -o libepc/libepc_libepc_1_0_la-tls.lo `test -f 'libepc/tls.c' || echo '$(srcdir)/'`libepc/tls.c tests/tests_libepc_tests_la-framework.lo: tests/framework.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libepc_tests_la_CFLAGS) $(CFLAGS) -MT tests/tests_libepc_tests_la-framework.lo -MD -MP -MF tests/$(DEPDIR)/tests_libepc_tests_la-framework.Tpo -c -o tests/tests_libepc_tests_la-framework.lo `test -f 'tests/framework.c' || echo '$(srcdir)/'`tests/framework.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_libepc_tests_la-framework.Tpo tests/$(DEPDIR)/tests_libepc_tests_la-framework.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libepc_tests_la_CFLAGS) $(CFLAGS) -MT tests/tests_libepc_tests_la-framework.lo -MD -MP -MF tests/$(DEPDIR)/tests_libepc_tests_la-framework.Tpo -c -o tests/tests_libepc_tests_la-framework.lo `test -f 'tests/framework.c' || echo '$(srcdir)/'`tests/framework.c +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_libepc_tests_la-framework.Tpo tests/$(DEPDIR)/tests_libepc_tests_la-framework.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/framework.c' object='tests/tests_libepc_tests_la-framework.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libepc_tests_la_CFLAGS) $(CFLAGS) -c -o tests/tests_libepc_tests_la-framework.lo `test -f 'tests/framework.c' || echo '$(srcdir)/'`tests/framework.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libepc_tests_la_CFLAGS) $(CFLAGS) -c -o tests/tests_libepc_tests_la-framework.lo `test -f 'tests/framework.c' || echo '$(srcdir)/'`tests/framework.c examples/examples_consumer_ui-consumer-ui.o: examples/consumer-ui.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_consumer_ui_CFLAGS) $(CFLAGS) -MT examples/examples_consumer_ui-consumer-ui.o -MD -MP -MF examples/$(DEPDIR)/examples_consumer_ui-consumer-ui.Tpo -c -o examples/examples_consumer_ui-consumer-ui.o `test -f 'examples/consumer-ui.c' || echo '$(srcdir)/'`examples/consumer-ui.c -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_consumer_ui-consumer-ui.Tpo examples/$(DEPDIR)/examples_consumer_ui-consumer-ui.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_consumer_ui-consumer-ui.Tpo examples/$(DEPDIR)/examples_consumer_ui-consumer-ui.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/consumer-ui.c' object='examples/examples_consumer_ui-consumer-ui.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_consumer_ui_CFLAGS) $(CFLAGS) -c -o examples/examples_consumer_ui-consumer-ui.o `test -f 'examples/consumer-ui.c' || echo '$(srcdir)/'`examples/consumer-ui.c examples/examples_consumer_ui-consumer-ui.obj: examples/consumer-ui.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_consumer_ui_CFLAGS) $(CFLAGS) -MT examples/examples_consumer_ui-consumer-ui.obj -MD -MP -MF examples/$(DEPDIR)/examples_consumer_ui-consumer-ui.Tpo -c -o examples/examples_consumer_ui-consumer-ui.obj `if test -f 'examples/consumer-ui.c'; then $(CYGPATH_W) 'examples/consumer-ui.c'; else $(CYGPATH_W) '$(srcdir)/examples/consumer-ui.c'; fi` -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_consumer_ui-consumer-ui.Tpo examples/$(DEPDIR)/examples_consumer_ui-consumer-ui.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_consumer_ui-consumer-ui.Tpo examples/$(DEPDIR)/examples_consumer_ui-consumer-ui.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/consumer-ui.c' object='examples/examples_consumer_ui-consumer-ui.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_consumer_ui_CFLAGS) $(CFLAGS) -c -o examples/examples_consumer_ui-consumer-ui.obj `if test -f 'examples/consumer-ui.c'; then $(CYGPATH_W) 'examples/consumer-ui.c'; else $(CYGPATH_W) '$(srcdir)/examples/consumer-ui.c'; fi` examples/examples_list_resources-list-resources.o: examples/list-resources.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_list_resources_CFLAGS) $(CFLAGS) -MT examples/examples_list_resources-list-resources.o -MD -MP -MF examples/$(DEPDIR)/examples_list_resources-list-resources.Tpo -c -o examples/examples_list_resources-list-resources.o `test -f 'examples/list-resources.c' || echo '$(srcdir)/'`examples/list-resources.c -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_list_resources-list-resources.Tpo examples/$(DEPDIR)/examples_list_resources-list-resources.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_list_resources-list-resources.Tpo examples/$(DEPDIR)/examples_list_resources-list-resources.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/list-resources.c' object='examples/examples_list_resources-list-resources.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_list_resources_CFLAGS) $(CFLAGS) -c -o examples/examples_list_resources-list-resources.o `test -f 'examples/list-resources.c' || echo '$(srcdir)/'`examples/list-resources.c examples/examples_list_resources-list-resources.obj: examples/list-resources.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_list_resources_CFLAGS) $(CFLAGS) -MT examples/examples_list_resources-list-resources.obj -MD -MP -MF examples/$(DEPDIR)/examples_list_resources-list-resources.Tpo -c -o examples/examples_list_resources-list-resources.obj `if test -f 'examples/list-resources.c'; then $(CYGPATH_W) 'examples/list-resources.c'; else $(CYGPATH_W) '$(srcdir)/examples/list-resources.c'; fi` -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_list_resources-list-resources.Tpo examples/$(DEPDIR)/examples_list_resources-list-resources.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_list_resources-list-resources.Tpo examples/$(DEPDIR)/examples_list_resources-list-resources.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/list-resources.c' object='examples/examples_list_resources-list-resources.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_list_resources_CFLAGS) $(CFLAGS) -c -o examples/examples_list_resources-list-resources.obj `if test -f 'examples/list-resources.c'; then $(CYGPATH_W) 'examples/list-resources.c'; else $(CYGPATH_W) '$(srcdir)/examples/list-resources.c'; fi` examples/examples_lookup_resource-lookup-resource.o: examples/lookup-resource.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_lookup_resource_CFLAGS) $(CFLAGS) -MT examples/examples_lookup_resource-lookup-resource.o -MD -MP -MF examples/$(DEPDIR)/examples_lookup_resource-lookup-resource.Tpo -c -o examples/examples_lookup_resource-lookup-resource.o `test -f 'examples/lookup-resource.c' || echo '$(srcdir)/'`examples/lookup-resource.c -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_lookup_resource-lookup-resource.Tpo examples/$(DEPDIR)/examples_lookup_resource-lookup-resource.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_lookup_resource-lookup-resource.Tpo examples/$(DEPDIR)/examples_lookup_resource-lookup-resource.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/lookup-resource.c' object='examples/examples_lookup_resource-lookup-resource.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_lookup_resource_CFLAGS) $(CFLAGS) -c -o examples/examples_lookup_resource-lookup-resource.o `test -f 'examples/lookup-resource.c' || echo '$(srcdir)/'`examples/lookup-resource.c examples/examples_lookup_resource-lookup-resource.obj: examples/lookup-resource.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_lookup_resource_CFLAGS) $(CFLAGS) -MT examples/examples_lookup_resource-lookup-resource.obj -MD -MP -MF examples/$(DEPDIR)/examples_lookup_resource-lookup-resource.Tpo -c -o examples/examples_lookup_resource-lookup-resource.obj `if test -f 'examples/lookup-resource.c'; then $(CYGPATH_W) 'examples/lookup-resource.c'; else $(CYGPATH_W) '$(srcdir)/examples/lookup-resource.c'; fi` -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_lookup_resource-lookup-resource.Tpo examples/$(DEPDIR)/examples_lookup_resource-lookup-resource.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_lookup_resource-lookup-resource.Tpo examples/$(DEPDIR)/examples_lookup_resource-lookup-resource.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/lookup-resource.c' object='examples/examples_lookup_resource-lookup-resource.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_lookup_resource_CFLAGS) $(CFLAGS) -c -o examples/examples_lookup_resource-lookup-resource.obj `if test -f 'examples/lookup-resource.c'; then $(CYGPATH_W) 'examples/lookup-resource.c'; else $(CYGPATH_W) '$(srcdir)/examples/lookup-resource.c'; fi` examples/examples_publisher_ui-publisher-ui.o: examples/publisher-ui.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_publisher_ui_CFLAGS) $(CFLAGS) -MT examples/examples_publisher_ui-publisher-ui.o -MD -MP -MF examples/$(DEPDIR)/examples_publisher_ui-publisher-ui.Tpo -c -o examples/examples_publisher_ui-publisher-ui.o `test -f 'examples/publisher-ui.c' || echo '$(srcdir)/'`examples/publisher-ui.c -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_publisher_ui-publisher-ui.Tpo examples/$(DEPDIR)/examples_publisher_ui-publisher-ui.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_publisher_ui-publisher-ui.Tpo examples/$(DEPDIR)/examples_publisher_ui-publisher-ui.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/publisher-ui.c' object='examples/examples_publisher_ui-publisher-ui.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_publisher_ui_CFLAGS) $(CFLAGS) -c -o examples/examples_publisher_ui-publisher-ui.o `test -f 'examples/publisher-ui.c' || echo '$(srcdir)/'`examples/publisher-ui.c examples/examples_publisher_ui-publisher-ui.obj: examples/publisher-ui.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_publisher_ui_CFLAGS) $(CFLAGS) -MT examples/examples_publisher_ui-publisher-ui.obj -MD -MP -MF examples/$(DEPDIR)/examples_publisher_ui-publisher-ui.Tpo -c -o examples/examples_publisher_ui-publisher-ui.obj `if test -f 'examples/publisher-ui.c'; then $(CYGPATH_W) 'examples/publisher-ui.c'; else $(CYGPATH_W) '$(srcdir)/examples/publisher-ui.c'; fi` -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_publisher_ui-publisher-ui.Tpo examples/$(DEPDIR)/examples_publisher_ui-publisher-ui.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_publisher_ui-publisher-ui.Tpo examples/$(DEPDIR)/examples_publisher_ui-publisher-ui.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/publisher-ui.c' object='examples/examples_publisher_ui-publisher-ui.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_publisher_ui_CFLAGS) $(CFLAGS) -c -o examples/examples_publisher_ui-publisher-ui.obj `if test -f 'examples/publisher-ui.c'; then $(CYGPATH_W) 'examples/publisher-ui.c'; else $(CYGPATH_W) '$(srcdir)/examples/publisher-ui.c'; fi` examples/examples_server_credentials-server-credentials.o: examples/server-credentials.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_server_credentials_CFLAGS) $(CFLAGS) -MT examples/examples_server_credentials-server-credentials.o -MD -MP -MF examples/$(DEPDIR)/examples_server_credentials-server-credentials.Tpo -c -o examples/examples_server_credentials-server-credentials.o `test -f 'examples/server-credentials.c' || echo '$(srcdir)/'`examples/server-credentials.c -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_server_credentials-server-credentials.Tpo examples/$(DEPDIR)/examples_server_credentials-server-credentials.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_server_credentials-server-credentials.Tpo examples/$(DEPDIR)/examples_server_credentials-server-credentials.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/server-credentials.c' object='examples/examples_server_credentials-server-credentials.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_server_credentials_CFLAGS) $(CFLAGS) -c -o examples/examples_server_credentials-server-credentials.o `test -f 'examples/server-credentials.c' || echo '$(srcdir)/'`examples/server-credentials.c examples/examples_server_credentials-server-credentials.obj: examples/server-credentials.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_server_credentials_CFLAGS) $(CFLAGS) -MT examples/examples_server_credentials-server-credentials.obj -MD -MP -MF examples/$(DEPDIR)/examples_server_credentials-server-credentials.Tpo -c -o examples/examples_server_credentials-server-credentials.obj `if test -f 'examples/server-credentials.c'; then $(CYGPATH_W) 'examples/server-credentials.c'; else $(CYGPATH_W) '$(srcdir)/examples/server-credentials.c'; fi` -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_server_credentials-server-credentials.Tpo examples/$(DEPDIR)/examples_server_credentials-server-credentials.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_server_credentials-server-credentials.Tpo examples/$(DEPDIR)/examples_server_credentials-server-credentials.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/server-credentials.c' object='examples/examples_server_credentials-server-credentials.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_server_credentials_CFLAGS) $(CFLAGS) -c -o examples/examples_server_credentials-server-credentials.obj `if test -f 'examples/server-credentials.c'; then $(CYGPATH_W) 'examples/server-credentials.c'; else $(CYGPATH_W) '$(srcdir)/examples/server-credentials.c'; fi` examples/examples_service_browser-service-browser.o: examples/service-browser.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_service_browser_CFLAGS) $(CFLAGS) -MT examples/examples_service_browser-service-browser.o -MD -MP -MF examples/$(DEPDIR)/examples_service_browser-service-browser.Tpo -c -o examples/examples_service_browser-service-browser.o `test -f 'examples/service-browser.c' || echo '$(srcdir)/'`examples/service-browser.c -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_service_browser-service-browser.Tpo examples/$(DEPDIR)/examples_service_browser-service-browser.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_service_browser-service-browser.Tpo examples/$(DEPDIR)/examples_service_browser-service-browser.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/service-browser.c' object='examples/examples_service_browser-service-browser.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_service_browser_CFLAGS) $(CFLAGS) -c -o examples/examples_service_browser-service-browser.o `test -f 'examples/service-browser.c' || echo '$(srcdir)/'`examples/service-browser.c examples/examples_service_browser-service-browser.obj: examples/service-browser.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_service_browser_CFLAGS) $(CFLAGS) -MT examples/examples_service_browser-service-browser.obj -MD -MP -MF examples/$(DEPDIR)/examples_service_browser-service-browser.Tpo -c -o examples/examples_service_browser-service-browser.obj `if test -f 'examples/service-browser.c'; then $(CYGPATH_W) 'examples/service-browser.c'; else $(CYGPATH_W) '$(srcdir)/examples/service-browser.c'; fi` -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_service_browser-service-browser.Tpo examples/$(DEPDIR)/examples_service_browser-service-browser.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_service_browser-service-browser.Tpo examples/$(DEPDIR)/examples_service_browser-service-browser.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/service-browser.c' object='examples/examples_service_browser-service-browser.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_service_browser_CFLAGS) $(CFLAGS) -c -o examples/examples_service_browser-service-browser.obj `if test -f 'examples/service-browser.c'; then $(CYGPATH_W) 'examples/service-browser.c'; else $(CYGPATH_W) '$(srcdir)/examples/service-browser.c'; fi` examples/examples_simple_publisher-simple-publisher.o: examples/simple-publisher.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_simple_publisher_CFLAGS) $(CFLAGS) -MT examples/examples_simple_publisher-simple-publisher.o -MD -MP -MF examples/$(DEPDIR)/examples_simple_publisher-simple-publisher.Tpo -c -o examples/examples_simple_publisher-simple-publisher.o `test -f 'examples/simple-publisher.c' || echo '$(srcdir)/'`examples/simple-publisher.c -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_simple_publisher-simple-publisher.Tpo examples/$(DEPDIR)/examples_simple_publisher-simple-publisher.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_simple_publisher-simple-publisher.Tpo examples/$(DEPDIR)/examples_simple_publisher-simple-publisher.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/simple-publisher.c' object='examples/examples_simple_publisher-simple-publisher.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_simple_publisher_CFLAGS) $(CFLAGS) -c -o examples/examples_simple_publisher-simple-publisher.o `test -f 'examples/simple-publisher.c' || echo '$(srcdir)/'`examples/simple-publisher.c examples/examples_simple_publisher-simple-publisher.obj: examples/simple-publisher.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_simple_publisher_CFLAGS) $(CFLAGS) -MT examples/examples_simple_publisher-simple-publisher.obj -MD -MP -MF examples/$(DEPDIR)/examples_simple_publisher-simple-publisher.Tpo -c -o examples/examples_simple_publisher-simple-publisher.obj `if test -f 'examples/simple-publisher.c'; then $(CYGPATH_W) 'examples/simple-publisher.c'; else $(CYGPATH_W) '$(srcdir)/examples/simple-publisher.c'; fi` -@am__fastdepCC_TRUE@ mv -f examples/$(DEPDIR)/examples_simple_publisher-simple-publisher.Tpo examples/$(DEPDIR)/examples_simple_publisher-simple-publisher.Po +@am__fastdepCC_TRUE@ $(am__mv) examples/$(DEPDIR)/examples_simple_publisher-simple-publisher.Tpo examples/$(DEPDIR)/examples_simple_publisher-simple-publisher.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='examples/simple-publisher.c' object='examples/examples_simple_publisher-simple-publisher.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_simple_publisher_CFLAGS) $(CFLAGS) -c -o examples/examples_simple_publisher-simple-publisher.obj `if test -f 'examples/simple-publisher.c'; then $(CYGPATH_W) 'examples/simple-publisher.c'; else $(CYGPATH_W) '$(srcdir)/examples/simple-publisher.c'; fi` tests/tests_test_consumer_by_info-test-consumer-by-info.o: tests/test-consumer-by-info.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_consumer_by_info_CFLAGS) $(CFLAGS) -MT tests/tests_test_consumer_by_info-test-consumer-by-info.o -MD -MP -MF tests/$(DEPDIR)/tests_test_consumer_by_info-test-consumer-by-info.Tpo -c -o tests/tests_test_consumer_by_info-test-consumer-by-info.o `test -f 'tests/test-consumer-by-info.c' || echo '$(srcdir)/'`tests/test-consumer-by-info.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_consumer_by_info-test-consumer-by-info.Tpo tests/$(DEPDIR)/tests_test_consumer_by_info-test-consumer-by-info.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_consumer_by_info-test-consumer-by-info.Tpo tests/$(DEPDIR)/tests_test_consumer_by_info-test-consumer-by-info.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-consumer-by-info.c' object='tests/tests_test_consumer_by_info-test-consumer-by-info.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_consumer_by_info_CFLAGS) $(CFLAGS) -c -o tests/tests_test_consumer_by_info-test-consumer-by-info.o `test -f 'tests/test-consumer-by-info.c' || echo '$(srcdir)/'`tests/test-consumer-by-info.c tests/tests_test_consumer_by_info-test-consumer-by-info.obj: tests/test-consumer-by-info.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_consumer_by_info_CFLAGS) $(CFLAGS) -MT tests/tests_test_consumer_by_info-test-consumer-by-info.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_consumer_by_info-test-consumer-by-info.Tpo -c -o tests/tests_test_consumer_by_info-test-consumer-by-info.obj `if test -f 'tests/test-consumer-by-info.c'; then $(CYGPATH_W) 'tests/test-consumer-by-info.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-consumer-by-info.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_consumer_by_info-test-consumer-by-info.Tpo tests/$(DEPDIR)/tests_test_consumer_by_info-test-consumer-by-info.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_consumer_by_info-test-consumer-by-info.Tpo tests/$(DEPDIR)/tests_test_consumer_by_info-test-consumer-by-info.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-consumer-by-info.c' object='tests/tests_test_consumer_by_info-test-consumer-by-info.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_consumer_by_info_CFLAGS) $(CFLAGS) -c -o tests/tests_test_consumer_by_info-test-consumer-by-info.obj `if test -f 'tests/test-consumer-by-info.c'; then $(CYGPATH_W) 'tests/test-consumer-by-info.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-consumer-by-info.c'; fi` tests/tests_test_consumer_by_name-test-consumer-by-name.o: tests/test-consumer-by-name.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_consumer_by_name_CFLAGS) $(CFLAGS) -MT tests/tests_test_consumer_by_name-test-consumer-by-name.o -MD -MP -MF tests/$(DEPDIR)/tests_test_consumer_by_name-test-consumer-by-name.Tpo -c -o tests/tests_test_consumer_by_name-test-consumer-by-name.o `test -f 'tests/test-consumer-by-name.c' || echo '$(srcdir)/'`tests/test-consumer-by-name.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_consumer_by_name-test-consumer-by-name.Tpo tests/$(DEPDIR)/tests_test_consumer_by_name-test-consumer-by-name.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_consumer_by_name-test-consumer-by-name.Tpo tests/$(DEPDIR)/tests_test_consumer_by_name-test-consumer-by-name.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-consumer-by-name.c' object='tests/tests_test_consumer_by_name-test-consumer-by-name.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_consumer_by_name_CFLAGS) $(CFLAGS) -c -o tests/tests_test_consumer_by_name-test-consumer-by-name.o `test -f 'tests/test-consumer-by-name.c' || echo '$(srcdir)/'`tests/test-consumer-by-name.c tests/tests_test_consumer_by_name-test-consumer-by-name.obj: tests/test-consumer-by-name.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_consumer_by_name_CFLAGS) $(CFLAGS) -MT tests/tests_test_consumer_by_name-test-consumer-by-name.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_consumer_by_name-test-consumer-by-name.Tpo -c -o tests/tests_test_consumer_by_name-test-consumer-by-name.obj `if test -f 'tests/test-consumer-by-name.c'; then $(CYGPATH_W) 'tests/test-consumer-by-name.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-consumer-by-name.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_consumer_by_name-test-consumer-by-name.Tpo tests/$(DEPDIR)/tests_test_consumer_by_name-test-consumer-by-name.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_consumer_by_name-test-consumer-by-name.Tpo tests/$(DEPDIR)/tests_test_consumer_by_name-test-consumer-by-name.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-consumer-by-name.c' object='tests/tests_test_consumer_by_name-test-consumer-by-name.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_consumer_by_name_CFLAGS) $(CFLAGS) -c -o tests/tests_test_consumer_by_name-test-consumer-by-name.obj `if test -f 'tests/test-consumer-by-name.c'; then $(CYGPATH_W) 'tests/test-consumer-by-name.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-consumer-by-name.c'; fi` tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.o: tests/test-dispatcher-local-collision.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_local_collision_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.o -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.Tpo -c -o tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.o `test -f 'tests/test-dispatcher-local-collision.c' || echo '$(srcdir)/'`tests/test-dispatcher-local-collision.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.Tpo tests/$(DEPDIR)/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.Tpo tests/$(DEPDIR)/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-local-collision.c' object='tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_local_collision_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.o `test -f 'tests/test-dispatcher-local-collision.c' || echo '$(srcdir)/'`tests/test-dispatcher-local-collision.c tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.obj: tests/test-dispatcher-local-collision.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_local_collision_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.Tpo -c -o tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.obj `if test -f 'tests/test-dispatcher-local-collision.c'; then $(CYGPATH_W) 'tests/test-dispatcher-local-collision.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-local-collision.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.Tpo tests/$(DEPDIR)/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.Tpo tests/$(DEPDIR)/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-local-collision.c' object='tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_local_collision_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.obj `if test -f 'tests/test-dispatcher-local-collision.c'; then $(CYGPATH_W) 'tests/test-dispatcher-local-collision.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-local-collision.c'; fi` tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.o: tests/test-dispatcher-multiple-services.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_multiple_services_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.o -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.Tpo -c -o tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.o `test -f 'tests/test-dispatcher-multiple-services.c' || echo '$(srcdir)/'`tests/test-dispatcher-multiple-services.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.Tpo tests/$(DEPDIR)/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.Tpo tests/$(DEPDIR)/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-multiple-services.c' object='tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_multiple_services_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.o `test -f 'tests/test-dispatcher-multiple-services.c' || echo '$(srcdir)/'`tests/test-dispatcher-multiple-services.c tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.obj: tests/test-dispatcher-multiple-services.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_multiple_services_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.Tpo -c -o tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.obj `if test -f 'tests/test-dispatcher-multiple-services.c'; then $(CYGPATH_W) 'tests/test-dispatcher-multiple-services.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-multiple-services.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.Tpo tests/$(DEPDIR)/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.Tpo tests/$(DEPDIR)/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-multiple-services.c' object='tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_multiple_services_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.obj `if test -f 'tests/test-dispatcher-multiple-services.c'; then $(CYGPATH_W) 'tests/test-dispatcher-multiple-services.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-multiple-services.c'; fi` tests/tests_test_dispatcher_rename-test-dispatcher-rename.o: tests/test-dispatcher-rename.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_rename_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_rename-test-dispatcher-rename.o -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_rename-test-dispatcher-rename.Tpo -c -o tests/tests_test_dispatcher_rename-test-dispatcher-rename.o `test -f 'tests/test-dispatcher-rename.c' || echo '$(srcdir)/'`tests/test-dispatcher-rename.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_rename-test-dispatcher-rename.Tpo tests/$(DEPDIR)/tests_test_dispatcher_rename-test-dispatcher-rename.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_rename-test-dispatcher-rename.Tpo tests/$(DEPDIR)/tests_test_dispatcher_rename-test-dispatcher-rename.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-rename.c' object='tests/tests_test_dispatcher_rename-test-dispatcher-rename.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_rename_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_rename-test-dispatcher-rename.o `test -f 'tests/test-dispatcher-rename.c' || echo '$(srcdir)/'`tests/test-dispatcher-rename.c tests/tests_test_dispatcher_rename-test-dispatcher-rename.obj: tests/test-dispatcher-rename.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_rename_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_rename-test-dispatcher-rename.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_rename-test-dispatcher-rename.Tpo -c -o tests/tests_test_dispatcher_rename-test-dispatcher-rename.obj `if test -f 'tests/test-dispatcher-rename.c'; then $(CYGPATH_W) 'tests/test-dispatcher-rename.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-rename.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_rename-test-dispatcher-rename.Tpo tests/$(DEPDIR)/tests_test_dispatcher_rename-test-dispatcher-rename.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_rename-test-dispatcher-rename.Tpo tests/$(DEPDIR)/tests_test_dispatcher_rename-test-dispatcher-rename.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-rename.c' object='tests/tests_test_dispatcher_rename-test-dispatcher-rename.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_rename_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_rename-test-dispatcher-rename.obj `if test -f 'tests/test-dispatcher-rename.c'; then $(CYGPATH_W) 'tests/test-dispatcher-rename.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-rename.c'; fi` tests/tests_test_dispatcher_reset-test-dispatcher-reset.o: tests/test-dispatcher-reset.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_reset_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_reset-test-dispatcher-reset.o -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_reset-test-dispatcher-reset.Tpo -c -o tests/tests_test_dispatcher_reset-test-dispatcher-reset.o `test -f 'tests/test-dispatcher-reset.c' || echo '$(srcdir)/'`tests/test-dispatcher-reset.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_reset-test-dispatcher-reset.Tpo tests/$(DEPDIR)/tests_test_dispatcher_reset-test-dispatcher-reset.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_reset-test-dispatcher-reset.Tpo tests/$(DEPDIR)/tests_test_dispatcher_reset-test-dispatcher-reset.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-reset.c' object='tests/tests_test_dispatcher_reset-test-dispatcher-reset.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_reset_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_reset-test-dispatcher-reset.o `test -f 'tests/test-dispatcher-reset.c' || echo '$(srcdir)/'`tests/test-dispatcher-reset.c tests/tests_test_dispatcher_reset-test-dispatcher-reset.obj: tests/test-dispatcher-reset.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_reset_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_reset-test-dispatcher-reset.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_reset-test-dispatcher-reset.Tpo -c -o tests/tests_test_dispatcher_reset-test-dispatcher-reset.obj `if test -f 'tests/test-dispatcher-reset.c'; then $(CYGPATH_W) 'tests/test-dispatcher-reset.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-reset.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_reset-test-dispatcher-reset.Tpo tests/$(DEPDIR)/tests_test_dispatcher_reset-test-dispatcher-reset.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_reset-test-dispatcher-reset.Tpo tests/$(DEPDIR)/tests_test_dispatcher_reset-test-dispatcher-reset.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-reset.c' object='tests/tests_test_dispatcher_reset-test-dispatcher-reset.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_reset_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_reset-test-dispatcher-reset.obj `if test -f 'tests/test-dispatcher-reset.c'; then $(CYGPATH_W) 'tests/test-dispatcher-reset.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-reset.c'; fi` tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.o: tests/test-dispatcher-simple-service.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_simple_service_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.o -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.Tpo -c -o tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.o `test -f 'tests/test-dispatcher-simple-service.c' || echo '$(srcdir)/'`tests/test-dispatcher-simple-service.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.Tpo tests/$(DEPDIR)/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.Tpo tests/$(DEPDIR)/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-simple-service.c' object='tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_simple_service_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.o `test -f 'tests/test-dispatcher-simple-service.c' || echo '$(srcdir)/'`tests/test-dispatcher-simple-service.c tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.obj: tests/test-dispatcher-simple-service.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_simple_service_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.Tpo -c -o tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.obj `if test -f 'tests/test-dispatcher-simple-service.c'; then $(CYGPATH_W) 'tests/test-dispatcher-simple-service.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-simple-service.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.Tpo tests/$(DEPDIR)/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.Tpo tests/$(DEPDIR)/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-simple-service.c' object='tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_simple_service_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.obj `if test -f 'tests/test-dispatcher-simple-service.c'; then $(CYGPATH_W) 'tests/test-dispatcher-simple-service.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-simple-service.c'; fi` tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.o: tests/test-dispatcher-subtypes.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_subtypes_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.o -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.Tpo -c -o tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.o `test -f 'tests/test-dispatcher-subtypes.c' || echo '$(srcdir)/'`tests/test-dispatcher-subtypes.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.Tpo tests/$(DEPDIR)/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.Tpo tests/$(DEPDIR)/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-subtypes.c' object='tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_subtypes_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.o `test -f 'tests/test-dispatcher-subtypes.c' || echo '$(srcdir)/'`tests/test-dispatcher-subtypes.c tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.obj: tests/test-dispatcher-subtypes.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_subtypes_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.Tpo -c -o tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.obj `if test -f 'tests/test-dispatcher-subtypes.c'; then $(CYGPATH_W) 'tests/test-dispatcher-subtypes.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-subtypes.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.Tpo tests/$(DEPDIR)/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.Tpo tests/$(DEPDIR)/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-subtypes.c' object='tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_subtypes_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.obj `if test -f 'tests/test-dispatcher-subtypes.c'; then $(CYGPATH_W) 'tests/test-dispatcher-subtypes.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-subtypes.c'; fi` tests/tests_test_dispatcher_unique-test-dispatcher-unique.o: tests/test-dispatcher-unique.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_unique_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_unique-test-dispatcher-unique.o -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_unique-test-dispatcher-unique.Tpo -c -o tests/tests_test_dispatcher_unique-test-dispatcher-unique.o `test -f 'tests/test-dispatcher-unique.c' || echo '$(srcdir)/'`tests/test-dispatcher-unique.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_unique-test-dispatcher-unique.Tpo tests/$(DEPDIR)/tests_test_dispatcher_unique-test-dispatcher-unique.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_unique-test-dispatcher-unique.Tpo tests/$(DEPDIR)/tests_test_dispatcher_unique-test-dispatcher-unique.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-unique.c' object='tests/tests_test_dispatcher_unique-test-dispatcher-unique.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_unique_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_unique-test-dispatcher-unique.o `test -f 'tests/test-dispatcher-unique.c' || echo '$(srcdir)/'`tests/test-dispatcher-unique.c tests/tests_test_dispatcher_unique-test-dispatcher-unique.obj: tests/test-dispatcher-unique.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_unique_CFLAGS) $(CFLAGS) -MT tests/tests_test_dispatcher_unique-test-dispatcher-unique.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_dispatcher_unique-test-dispatcher-unique.Tpo -c -o tests/tests_test_dispatcher_unique-test-dispatcher-unique.obj `if test -f 'tests/test-dispatcher-unique.c'; then $(CYGPATH_W) 'tests/test-dispatcher-unique.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-unique.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_dispatcher_unique-test-dispatcher-unique.Tpo tests/$(DEPDIR)/tests_test_dispatcher_unique-test-dispatcher-unique.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_dispatcher_unique-test-dispatcher-unique.Tpo tests/$(DEPDIR)/tests_test_dispatcher_unique-test-dispatcher-unique.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-dispatcher-unique.c' object='tests/tests_test_dispatcher_unique-test-dispatcher-unique.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_dispatcher_unique_CFLAGS) $(CFLAGS) -c -o tests/tests_test_dispatcher_unique-test-dispatcher-unique.obj `if test -f 'tests/test-dispatcher-unique.c'; then $(CYGPATH_W) 'tests/test-dispatcher-unique.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-dispatcher-unique.c'; fi` tests/tests_test_expand_name-test-expand-name.o: tests/test-expand-name.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_expand_name_CFLAGS) $(CFLAGS) -MT tests/tests_test_expand_name-test-expand-name.o -MD -MP -MF tests/$(DEPDIR)/tests_test_expand_name-test-expand-name.Tpo -c -o tests/tests_test_expand_name-test-expand-name.o `test -f 'tests/test-expand-name.c' || echo '$(srcdir)/'`tests/test-expand-name.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_expand_name-test-expand-name.Tpo tests/$(DEPDIR)/tests_test_expand_name-test-expand-name.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_expand_name-test-expand-name.Tpo tests/$(DEPDIR)/tests_test_expand_name-test-expand-name.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-expand-name.c' object='tests/tests_test_expand_name-test-expand-name.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_expand_name_CFLAGS) $(CFLAGS) -c -o tests/tests_test_expand_name-test-expand-name.o `test -f 'tests/test-expand-name.c' || echo '$(srcdir)/'`tests/test-expand-name.c tests/tests_test_expand_name-test-expand-name.obj: tests/test-expand-name.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_expand_name_CFLAGS) $(CFLAGS) -MT tests/tests_test_expand_name-test-expand-name.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_expand_name-test-expand-name.Tpo -c -o tests/tests_test_expand_name-test-expand-name.obj `if test -f 'tests/test-expand-name.c'; then $(CYGPATH_W) 'tests/test-expand-name.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-expand-name.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_expand_name-test-expand-name.Tpo tests/$(DEPDIR)/tests_test_expand_name-test-expand-name.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_expand_name-test-expand-name.Tpo tests/$(DEPDIR)/tests_test_expand_name-test-expand-name.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-expand-name.c' object='tests/tests_test_expand_name-test-expand-name.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_expand_name_CFLAGS) $(CFLAGS) -c -o tests/tests_test_expand_name-test-expand-name.obj `if test -f 'tests/test-expand-name.c'; then $(CYGPATH_W) 'tests/test-expand-name.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-expand-name.c'; fi` tests/tests_test_progress_hooks-test-progress-hooks.o: tests/test-progress-hooks.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_progress_hooks_CFLAGS) $(CFLAGS) -MT tests/tests_test_progress_hooks-test-progress-hooks.o -MD -MP -MF tests/$(DEPDIR)/tests_test_progress_hooks-test-progress-hooks.Tpo -c -o tests/tests_test_progress_hooks-test-progress-hooks.o `test -f 'tests/test-progress-hooks.c' || echo '$(srcdir)/'`tests/test-progress-hooks.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_progress_hooks-test-progress-hooks.Tpo tests/$(DEPDIR)/tests_test_progress_hooks-test-progress-hooks.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_progress_hooks-test-progress-hooks.Tpo tests/$(DEPDIR)/tests_test_progress_hooks-test-progress-hooks.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-progress-hooks.c' object='tests/tests_test_progress_hooks-test-progress-hooks.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_progress_hooks_CFLAGS) $(CFLAGS) -c -o tests/tests_test_progress_hooks-test-progress-hooks.o `test -f 'tests/test-progress-hooks.c' || echo '$(srcdir)/'`tests/test-progress-hooks.c tests/tests_test_progress_hooks-test-progress-hooks.obj: tests/test-progress-hooks.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_progress_hooks_CFLAGS) $(CFLAGS) -MT tests/tests_test_progress_hooks-test-progress-hooks.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_progress_hooks-test-progress-hooks.Tpo -c -o tests/tests_test_progress_hooks-test-progress-hooks.obj `if test -f 'tests/test-progress-hooks.c'; then $(CYGPATH_W) 'tests/test-progress-hooks.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-progress-hooks.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_progress_hooks-test-progress-hooks.Tpo tests/$(DEPDIR)/tests_test_progress_hooks-test-progress-hooks.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_progress_hooks-test-progress-hooks.Tpo tests/$(DEPDIR)/tests_test_progress_hooks-test-progress-hooks.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-progress-hooks.c' object='tests/tests_test_progress_hooks-test-progress-hooks.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_progress_hooks_CFLAGS) $(CFLAGS) -c -o tests/tests_test_progress_hooks-test-progress-hooks.obj `if test -f 'tests/test-progress-hooks.c'; then $(CYGPATH_W) 'tests/test-progress-hooks.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-progress-hooks.c'; fi` tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.o: tests/test-publisher-bookmarks.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_bookmarks_CFLAGS) $(CFLAGS) -MT tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.o -MD -MP -MF tests/$(DEPDIR)/tests_test_publisher_bookmarks-test-publisher-bookmarks.Tpo -c -o tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.o `test -f 'tests/test-publisher-bookmarks.c' || echo '$(srcdir)/'`tests/test-publisher-bookmarks.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_publisher_bookmarks-test-publisher-bookmarks.Tpo tests/$(DEPDIR)/tests_test_publisher_bookmarks-test-publisher-bookmarks.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_publisher_bookmarks-test-publisher-bookmarks.Tpo tests/$(DEPDIR)/tests_test_publisher_bookmarks-test-publisher-bookmarks.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-publisher-bookmarks.c' object='tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_bookmarks_CFLAGS) $(CFLAGS) -c -o tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.o `test -f 'tests/test-publisher-bookmarks.c' || echo '$(srcdir)/'`tests/test-publisher-bookmarks.c tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.obj: tests/test-publisher-bookmarks.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_bookmarks_CFLAGS) $(CFLAGS) -MT tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_publisher_bookmarks-test-publisher-bookmarks.Tpo -c -o tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.obj `if test -f 'tests/test-publisher-bookmarks.c'; then $(CYGPATH_W) 'tests/test-publisher-bookmarks.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-publisher-bookmarks.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_publisher_bookmarks-test-publisher-bookmarks.Tpo tests/$(DEPDIR)/tests_test_publisher_bookmarks-test-publisher-bookmarks.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_publisher_bookmarks-test-publisher-bookmarks.Tpo tests/$(DEPDIR)/tests_test_publisher_bookmarks-test-publisher-bookmarks.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-publisher-bookmarks.c' object='tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_bookmarks_CFLAGS) $(CFLAGS) -c -o tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.obj `if test -f 'tests/test-publisher-bookmarks.c'; then $(CYGPATH_W) 'tests/test-publisher-bookmarks.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-publisher-bookmarks.c'; fi` tests/tests_test_publisher_change_name-test-publisher-change-name.o: tests/test-publisher-change-name.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_change_name_CFLAGS) $(CFLAGS) -MT tests/tests_test_publisher_change_name-test-publisher-change-name.o -MD -MP -MF tests/$(DEPDIR)/tests_test_publisher_change_name-test-publisher-change-name.Tpo -c -o tests/tests_test_publisher_change_name-test-publisher-change-name.o `test -f 'tests/test-publisher-change-name.c' || echo '$(srcdir)/'`tests/test-publisher-change-name.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_publisher_change_name-test-publisher-change-name.Tpo tests/$(DEPDIR)/tests_test_publisher_change_name-test-publisher-change-name.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_publisher_change_name-test-publisher-change-name.Tpo tests/$(DEPDIR)/tests_test_publisher_change_name-test-publisher-change-name.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-publisher-change-name.c' object='tests/tests_test_publisher_change_name-test-publisher-change-name.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_change_name_CFLAGS) $(CFLAGS) -c -o tests/tests_test_publisher_change_name-test-publisher-change-name.o `test -f 'tests/test-publisher-change-name.c' || echo '$(srcdir)/'`tests/test-publisher-change-name.c tests/tests_test_publisher_change_name-test-publisher-change-name.obj: tests/test-publisher-change-name.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_change_name_CFLAGS) $(CFLAGS) -MT tests/tests_test_publisher_change_name-test-publisher-change-name.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_publisher_change_name-test-publisher-change-name.Tpo -c -o tests/tests_test_publisher_change_name-test-publisher-change-name.obj `if test -f 'tests/test-publisher-change-name.c'; then $(CYGPATH_W) 'tests/test-publisher-change-name.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-publisher-change-name.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_publisher_change_name-test-publisher-change-name.Tpo tests/$(DEPDIR)/tests_test_publisher_change_name-test-publisher-change-name.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_publisher_change_name-test-publisher-change-name.Tpo tests/$(DEPDIR)/tests_test_publisher_change_name-test-publisher-change-name.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-publisher-change-name.c' object='tests/tests_test_publisher_change_name-test-publisher-change-name.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_change_name_CFLAGS) $(CFLAGS) -c -o tests/tests_test_publisher_change_name-test-publisher-change-name.obj `if test -f 'tests/test-publisher-change-name.c'; then $(CYGPATH_W) 'tests/test-publisher-change-name.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-publisher-change-name.c'; fi` tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.o: tests/test-publisher-libsoup-494128.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_libsoup_494128_CFLAGS) $(CFLAGS) -MT tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.o -MD -MP -MF tests/$(DEPDIR)/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.Tpo -c -o tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.o `test -f 'tests/test-publisher-libsoup-494128.c' || echo '$(srcdir)/'`tests/test-publisher-libsoup-494128.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.Tpo tests/$(DEPDIR)/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.Tpo tests/$(DEPDIR)/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-publisher-libsoup-494128.c' object='tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_libsoup_494128_CFLAGS) $(CFLAGS) -c -o tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.o `test -f 'tests/test-publisher-libsoup-494128.c' || echo '$(srcdir)/'`tests/test-publisher-libsoup-494128.c tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.obj: tests/test-publisher-libsoup-494128.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_libsoup_494128_CFLAGS) $(CFLAGS) -MT tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.Tpo -c -o tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.obj `if test -f 'tests/test-publisher-libsoup-494128.c'; then $(CYGPATH_W) 'tests/test-publisher-libsoup-494128.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-publisher-libsoup-494128.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.Tpo tests/$(DEPDIR)/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.Tpo tests/$(DEPDIR)/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-publisher-libsoup-494128.c' object='tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_libsoup_494128_CFLAGS) $(CFLAGS) -c -o tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.obj `if test -f 'tests/test-publisher-libsoup-494128.c'; then $(CYGPATH_W) 'tests/test-publisher-libsoup-494128.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-publisher-libsoup-494128.c'; fi` tests/tests_test_publisher_unique-test-publisher-unique.o: tests/test-publisher-unique.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_unique_CFLAGS) $(CFLAGS) -MT tests/tests_test_publisher_unique-test-publisher-unique.o -MD -MP -MF tests/$(DEPDIR)/tests_test_publisher_unique-test-publisher-unique.Tpo -c -o tests/tests_test_publisher_unique-test-publisher-unique.o `test -f 'tests/test-publisher-unique.c' || echo '$(srcdir)/'`tests/test-publisher-unique.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_publisher_unique-test-publisher-unique.Tpo tests/$(DEPDIR)/tests_test_publisher_unique-test-publisher-unique.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_publisher_unique-test-publisher-unique.Tpo tests/$(DEPDIR)/tests_test_publisher_unique-test-publisher-unique.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-publisher-unique.c' object='tests/tests_test_publisher_unique-test-publisher-unique.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_unique_CFLAGS) $(CFLAGS) -c -o tests/tests_test_publisher_unique-test-publisher-unique.o `test -f 'tests/test-publisher-unique.c' || echo '$(srcdir)/'`tests/test-publisher-unique.c tests/tests_test_publisher_unique-test-publisher-unique.obj: tests/test-publisher-unique.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_unique_CFLAGS) $(CFLAGS) -MT tests/tests_test_publisher_unique-test-publisher-unique.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_publisher_unique-test-publisher-unique.Tpo -c -o tests/tests_test_publisher_unique-test-publisher-unique.obj `if test -f 'tests/test-publisher-unique.c'; then $(CYGPATH_W) 'tests/test-publisher-unique.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-publisher-unique.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_publisher_unique-test-publisher-unique.Tpo tests/$(DEPDIR)/tests_test_publisher_unique-test-publisher-unique.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_publisher_unique-test-publisher-unique.Tpo tests/$(DEPDIR)/tests_test_publisher_unique-test-publisher-unique.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-publisher-unique.c' object='tests/tests_test_publisher_unique-test-publisher-unique.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_publisher_unique_CFLAGS) $(CFLAGS) -c -o tests/tests_test_publisher_unique-test-publisher-unique.obj `if test -f 'tests/test-publisher-unique.c'; then $(CYGPATH_W) 'tests/test-publisher-unique.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-publisher-unique.c'; fi` tests/tests_test_service_type-test-service-type.o: tests/test-service-type.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_service_type_CFLAGS) $(CFLAGS) -MT tests/tests_test_service_type-test-service-type.o -MD -MP -MF tests/$(DEPDIR)/tests_test_service_type-test-service-type.Tpo -c -o tests/tests_test_service_type-test-service-type.o `test -f 'tests/test-service-type.c' || echo '$(srcdir)/'`tests/test-service-type.c -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_service_type-test-service-type.Tpo tests/$(DEPDIR)/tests_test_service_type-test-service-type.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_service_type-test-service-type.Tpo tests/$(DEPDIR)/tests_test_service_type-test-service-type.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-service-type.c' object='tests/tests_test_service_type-test-service-type.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_service_type_CFLAGS) $(CFLAGS) -c -o tests/tests_test_service_type-test-service-type.o `test -f 'tests/test-service-type.c' || echo '$(srcdir)/'`tests/test-service-type.c tests/tests_test_service_type-test-service-type.obj: tests/test-service-type.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_service_type_CFLAGS) $(CFLAGS) -MT tests/tests_test_service_type-test-service-type.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_service_type-test-service-type.Tpo -c -o tests/tests_test_service_type-test-service-type.obj `if test -f 'tests/test-service-type.c'; then $(CYGPATH_W) 'tests/test-service-type.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-service-type.c'; fi` -@am__fastdepCC_TRUE@ mv -f tests/$(DEPDIR)/tests_test_service_type-test-service-type.Tpo tests/$(DEPDIR)/tests_test_service_type-test-service-type.Po +@am__fastdepCC_TRUE@ $(am__mv) tests/$(DEPDIR)/tests_test_service_type-test-service-type.Tpo tests/$(DEPDIR)/tests_test_service_type-test-service-type.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/test-service-type.c' object='tests/tests_test_service_type-test-service-type.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_test_service_type_CFLAGS) $(CFLAGS) -c -o tests/tests_test_service_type-test-service-type.obj `if test -f 'tests/test-service-type.c'; then $(CYGPATH_W) 'tests/test-service-type.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-service-type.c'; fi` @@ -1606,54 +1635,63 @@ install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files install-libepc_includeHEADERS: $(libepc_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(libepc_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libepc_includedir)" - @list='$(libepc_include_HEADERS)'; for p in $$list; do \ + @list='$(libepc_include_HEADERS)'; test -n "$(libepc_includedir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libepc_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libepc_includedir)/$$f'"; \ - $(libepc_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libepc_includedir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libepc_includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libepc_includedir)" || exit $$?; \ done uninstall-libepc_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(libepc_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libepc_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libepc_includedir)/$$f"; \ - done + @list='$(libepc_include_HEADERS)'; test -n "$(libepc_includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(libepc_includedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(libepc_includedir)" && rm -f $$files install-libepc_ui_includeHEADERS: $(libepc_ui_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(libepc_ui_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libepc_ui_includedir)" - @list='$(libepc_ui_include_HEADERS)'; for p in $$list; do \ + @list='$(libepc_ui_include_HEADERS)'; test -n "$(libepc_ui_includedir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libepc_ui_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libepc_ui_includedir)/$$f'"; \ - $(libepc_ui_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libepc_ui_includedir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libepc_ui_includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libepc_ui_includedir)" || exit $$?; \ done uninstall-libepc_ui_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(libepc_ui_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libepc_ui_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libepc_ui_includedir)/$$f"; \ - done + @list='$(libepc_ui_include_HEADERS)'; test -n "$(libepc_ui_includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(libepc_ui_includedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(libepc_ui_includedir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -1679,7 +1717,7 @@ 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 \ @@ -1713,16 +1751,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) @@ -1737,7 +1775,7 @@ 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; \ @@ -1749,7 +1787,7 @@ 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)'; \ @@ -1758,29 +1796,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + 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=; \ 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; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + 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 @@ -1789,6 +1832,7 @@ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ srcdir=$(srcdir); export srcdir; \ list=' $(TESTS) '; \ + $(am__tty_colors); \ if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ @@ -1800,10 +1844,10 @@ *[\ \ ]$$tst[\ \ ]*) \ xpass=`expr $$xpass + 1`; \ failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ + col=$$red; res=XPASS; \ ;; \ *) \ - echo "PASS: $$tst"; \ + col=$$grn; res=PASS; \ ;; \ esac; \ elif test $$? -ne 77; then \ @@ -1811,17 +1855,18 @@ case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ + col=$$lgn; res=XFAIL; \ ;; \ *) \ failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ + col=$$red; res=FAIL; \ ;; \ esac; \ else \ skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ + col=$$blu; res=SKIP; \ fi; \ + echo "$${col}$$res$${std}: $$tst"; \ done; \ if test "$$all" -eq 1; then \ tests="test"; \ @@ -1863,17 +1908,21 @@ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ + if test "$$failed" -eq 0; then \ + echo "$$grn$$dashes"; \ + else \ + echo "$$red$$dashes"; \ + fi; \ echo "$$banner"; \ test -z "$$skipped" || echo "$$skipped"; \ test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ + echo "$$dashes$$std"; \ test "$$failed" -eq 0; \ else :; fi distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) + test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1889,29 +1938,44 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); 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" \ || 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; \ @@ -1919,12 +1983,13 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook - -find "$(distdir)" -type d ! -perm -755 \ + -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 $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -1936,6 +2001,10 @@ 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) @@ -1960,15 +2029,17 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -1976,9 +2047,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) \ @@ -2000,13 +2073,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 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 \ @@ -2055,6 +2130,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) -rm -f examples/$(DEPDIR)/$(am__dirstamp) -rm -f examples/$(am__dirstamp) -rm -f libepc-ui/$(DEPDIR)/$(am__dirstamp) @@ -2146,16 +2222,17 @@ uninstall-libepc_ui_includeHEADERS uninstall-local \ uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ + check-am ctags-recursive install install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am all-local am--refresh check check-TESTS check-am \ clean clean-generic clean-libLTLIBRARIES clean-libtool \ clean-local clean-noinstLTLIBRARIES clean-noinstPROGRAMS ctags \ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-hdr \ + dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-local distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-data \ @@ -2242,6 +2319,7 @@ # ===================== -include Makefile.local + # 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 libepc-0.3.11/missing libepc-0.4.2/missing --- libepc-0.3.11/missing 2010-03-23 13:08:19.000000000 +0000 +++ libepc-0.4.2/missing 2011-10-13 14:51:55.000000000 +0000 @@ -18,9 +18,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 diff -Nru libepc-0.3.11/NEWS libepc-0.4.2/NEWS --- libepc-0.3.11/NEWS 2010-03-23 13:04:23.000000000 +0000 +++ libepc-0.4.2/NEWS 2011-10-13 14:48:31.000000000 +0000 @@ -1,3 +1,28 @@ +Release 0.4.2 +============== + + * Build: + - examples: Fix linker problems. + (Murray Cumming) + - Avoid use of deprecated G_CONST_RETURN. + (Ionut Biru) Bug #660558 + +Release 0.4.1 +============== + + * Really use gtk+ 3 in libepc-ui. + (Murray Cumming) Bug #657679 (Frederic Peters) + +Release 0.4.0 +============== + + * Use avahi-ui-gtk3, and therefore GTK+ 3, instead of avahi-ui, which + used GTK+ 2. This is an ABI change, but libepc is still an unstable + library anyway. + Bug #649404 (Christopher Dale) + * Fix compilation with GSEAL_ENABLE defined. + (David King) + Release 0.3.11 ============== diff -Nru libepc-0.3.11/po/id.po libepc-0.4.2/po/id.po --- libepc-0.3.11/po/id.po 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/po/id.po 2010-12-16 09:39:49.000000000 +0000 @@ -0,0 +1,144 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Imam Musthaqim +# +msgid "" +msgstr "" +"Project-Id-Version: libepc.HEAD\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=libepc&component=general\n" +"POT-Creation-Date: 2010-03-24 16:01+0000\n" +"PO-Revision-Date: 2009-04-14 19:20+0700\n" +"Last-Translator: Imam Musthaqim \n" +"Language-Team: INDONESIA \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Indonesian\n" +"X-Poedit-Country: INDONESIA\n" + +#: ../libepc/consumer.c:1079 +#, c-format +msgid "Unexpected element: '%s'" +msgstr "Elemen yang tidak diharapkan: '%s' " + +#: ../libepc/publisher.c:659 +msgid "Table of Contents" +msgstr "Daftar Isi" + +#: ../libepc/publisher.c:693 +msgid "Sorry, no resources published yet." +msgstr "Maaf, belum ada sumber daya yang dipublikasikan." + +#: ../libepc/publisher.c:2638 +msgid "%a of %u on %h" +msgstr "%a dari %u pada %h" + +#: ../libepc/shell.c:267 +#, c-format +msgid "Cannot create Avahi client: %s" +msgstr "Tidak dapat membuat klien Avahi: %s" + +#: ../libepc/shell.c:379 +#, c-format +msgid "Cannot create Avahi service browser." +msgstr "Tidak dapat membuat browser layanan Avahi." + +#. Translators: This is just a generic default message for a progress bar. +#: ../libepc/shell.c:467 +#, fuzzy +#| msgid "Operation Proceeded" +msgid "Operation in Progress" +msgstr "Operasi Dilanjutkan" + +#: ../libepc/shell.c:471 +msgid "No details known" +msgstr "Tidak ada rincian yang diketahui" + +#: ../libepc/tls.c:165 +msgid "Generating Server Key" +msgstr "Membuat Kunci Server" + +#: ../libepc/tls.c:166 +msgid "" +"This may take some time. Type on the keyboard, move your mouse, or browse " +"the web to generate some entropy." +msgstr "" +"Ini mungkin memerlukan waktu sejenak. Ketik pada keyboard, gerakkan mouse " +"Anda, atau jelajahi web untuk membuat beberapa entropi." + +#: ../libepc/tls.c:191 +#, c-format +msgid "Cannot create private server key: %s" +msgstr "Tidak dapat membuat kunci server privat: %s" + +#: ../libepc/tls.c:244 +#, c-format +msgid "Cannot import private server key '%s': %s" +msgstr "Tidak dapat mengimpor kunci server privat '%s': %s" + +#: ../libepc/tls.c:300 +#, c-format +msgid "Cannot export private key to PEM format: %s" +msgstr "Tidak dapat mengekspor kunci privat ke format PEM: %s" + +#: ../libepc/tls.c:314 +#, c-format +msgid "Failed to create private key folder '%s': %s" +msgstr "Gagal membuat folder kunci privat '%s': %s" + +#: ../libepc/tls.c:330 +#, c-format +msgid "Failed to create private key file '%s': %s" +msgstr "Gagal membuat file kunci privat '%s': %s" + +#: ../libepc/tls.c:344 +#, c-format +msgid "Failed to write private key file '%s': %s" +msgstr "Gagal menulis file kunci privat '%s': %s" + +#: ../libepc/tls.c:416 +#, c-format +msgid "Cannot create self signed server key for '%s': %s" +msgstr "Tidak dapat membuat kunci server bertanda-sendiri untuk '%s': %s" + +#: ../libepc/tls.c:470 +#, c-format +msgid "Cannot import server certificate '%s': %s" +msgstr "Tidak dapat mengimpor sertifikat server '%s': %s" + +#: ../libepc/tls.c:525 +#, c-format +msgid "Cannot export server certificate to PEM format: %s" +msgstr "Tidak dapat mengekspor sertifikat server ke format PEM: %s" + +#: ../libepc/tls.c:539 +#, c-format +msgid "Failed to create server certificate folder '%s': %s" +msgstr "Gagal membuat folder sertifikat server '%s': %s" + +#: ../libepc-ui/password-dialog.c:102 +msgid "Authentication required." +msgstr "Pengesahan diperlukan." + +#: ../libepc-ui/password-dialog.c:113 +msgid "_Username:" +msgstr "_Nama pengguna:" + +#: ../libepc-ui/password-dialog.c:119 +msgid "_Password:" +msgstr "_Kata sandi:" + +#: ../libepc-ui/password-dialog.c:125 +msgid "Anonymous Authentication" +msgstr "Pengesahan Anonim" + +#: ../libepc-ui/password-dialog.c:210 +#, c-format +msgid "Data source %s requires authentication before permitting access." +msgstr "Sumber data %s memerlukan pengesahan sebelum mengizinkan akses." + +#: ../libepc-ui/password-dialog.c:213 +msgid "Authentication required." +msgstr "Pengesahan diperlukan." diff -Nru libepc-0.3.11/po/LINGUAS libepc-0.4.2/po/LINGUAS --- libepc-0.3.11/po/LINGUAS 2010-03-19 09:43:37.000000000 +0000 +++ libepc-0.4.2/po/LINGUAS 2011-08-31 12:03:24.000000000 +0000 @@ -9,11 +9,14 @@ fi fr gl +id it ja +lv nb pl pt_BR +ru sl sv th diff -Nru libepc-0.3.11/po/lv.po libepc-0.4.2/po/lv.po --- libepc-0.3.11/po/lv.po 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/po/lv.po 2011-05-05 10:17:55.000000000 +0000 @@ -0,0 +1,143 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Rūdofls Mazurs , 2011. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +"cgi?product=libepc&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-29 08:54+0000\n" +"PO-Revision-Date: 2011-04-20 12:30+0300\n" +"Last-Translator: Rūdofls Mazurs \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.1\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " +"2);\n" + +#: ../libepc/consumer.c:1083 +#, c-format +msgid "Unexpected element: '%s'" +msgstr "Negaidīts elements: '%s'" + +#: ../libepc/publisher.c:663 +msgid "Table of Contents" +msgstr "Satura rādītājs" + +#: ../libepc/publisher.c:697 +msgid "Sorry, no resources published yet." +msgstr "Diemžēl resursi vēl nav publicēti." + +#: ../libepc/publisher.c:2642 +msgid "%a of %u on %h" +msgstr "%a no %u uz %h" + +#: ../libepc/shell.c:272 +#, c-format +msgid "Cannot create Avahi client: %s" +msgstr "Nevar izveidot Avahi klientu: %s" + +#: ../libepc/shell.c:384 +#, c-format +msgid "Cannot create Avahi service browser." +msgstr "Neizdevās izveidot Avahi servisa pārlūku." + +#. Translators: This is just a generic default message for a progress bar. +#: ../libepc/shell.c:472 +msgid "Operation in Progress" +msgstr "Notiek darbība" + +#: ../libepc/shell.c:476 +msgid "No details known" +msgstr "Nav zināma sīkāka informācija" + +#: ../libepc/tls.c:170 +msgid "Generating Server Key" +msgstr "Ģenerē servera atslēgu" + +#: ../libepc/tls.c:171 +msgid "" +"This may take some time. Type on the keyboard, move your mouse, or browse " +"the web to generate some entropy." +msgstr "" +"Uzgaidiet dažas minūtes. Rakstiet kaut ko uz tastatūras, kustiniet peli vai " +"pārlūkojiet tīmekli, lai radītu kaut kādu entropiju." + +#: ../libepc/tls.c:196 +#, c-format +msgid "Cannot create private server key: %s" +msgstr "Nevar izveidot privātu servera atslēgu: %s" + +#: ../libepc/tls.c:249 +#, c-format +msgid "Cannot import private server key '%s': %s" +msgstr "Nevar importēt privātu servera atslēgu '%s': %s" + +#: ../libepc/tls.c:305 +#, c-format +msgid "Cannot export private key to PEM format: %s" +msgstr "Nevar eksportēt privāto atslēgu uz PEM formātu: %s" + +#: ../libepc/tls.c:319 +#, c-format +msgid "Failed to create private key folder '%s': %s" +msgstr "Neizdevās izveidot privātās atslēgas mapi '%s': %s" + +#: ../libepc/tls.c:335 +#, c-format +msgid "Failed to create private key file '%s': %s" +msgstr "Neizdevās izveidot privātās atslēgas failu '%s': %s" + +#: ../libepc/tls.c:349 +#, c-format +msgid "Failed to write private key file '%s': %s" +msgstr "Neizdevās rakstīt privātās atslēgas failu '%s': %s" + +#: ../libepc/tls.c:421 +#, c-format +msgid "Cannot create self signed server key for '%s': %s" +msgstr "Nevar izveidot pašparakstītu atslēgu priekš '%s': %s" + +#: ../libepc/tls.c:475 +#, c-format +msgid "Cannot import server certificate '%s': %s" +msgstr "Nevar importēt servera sertifikātu '%s': %s" + +#: ../libepc/tls.c:530 +#, c-format +msgid "Cannot export server certificate to PEM format: %s" +msgstr "Nevar eksportēt servera sertifikātu uz PEM formātu: %s" + +#: ../libepc/tls.c:544 +#, c-format +msgid "Failed to create server certificate folder '%s': %s" +msgstr "Neizdevās izveidot servera sertifikāta mapi '%s': %s" + +#: ../libepc-ui/password-dialog.c:106 +msgid "Authentication required." +msgstr "Nepieciešama autentifikācija" + +#: ../libepc-ui/password-dialog.c:117 +msgid "_Username:" +msgstr "_Lietotājvārds:" + +#: ../libepc-ui/password-dialog.c:123 +msgid "_Password:" +msgstr "_Parole:" + +#: ../libepc-ui/password-dialog.c:129 +msgid "Anonymous Authentication" +msgstr "Anonīma autentifikācija" + +#: ../libepc-ui/password-dialog.c:214 +#, c-format +msgid "Data source %s requires authentication before permitting access." +msgstr "Datu avots %s pieprasa autentificēšanos pirms ļaut piekļūt." + +#: ../libepc-ui/password-dialog.c:217 +msgid "Authentication required." +msgstr "Nepieciešama autentifikācija." + diff -Nru libepc-0.3.11/po/Makefile.in.in libepc-0.4.2/po/Makefile.in.in --- libepc-0.3.11/po/Makefile.in.in 2010-03-23 13:08:16.000000000 +0000 +++ libepc-0.4.2/po/Makefile.in.in 2011-10-13 14:51:51.000000000 +0000 @@ -21,7 +21,7 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -56,7 +56,7 @@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) @@ -129,7 +129,7 @@ done # Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: +dvi info ctags tags CTAGS TAGS ID: # Define this as empty until I found a useful application. install-exec installcheck: diff -Nru libepc-0.3.11/po/pt_BR.po libepc-0.4.2/po/pt_BR.po --- libepc-0.3.11/po/pt_BR.po 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/po/pt_BR.po 2011-03-29 08:53:30.000000000 +0000 @@ -9,10 +9,10 @@ msgstr "" "Project-Id-Version: libepc\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=libepc\n" -"POT-Creation-Date: 2008-11-07 14:28+0100\n" -"PO-Revision-Date: 2009-01-05 19:13-0300\n" -"Last-Translator: Enrico Nicoletto \n" +"product=libepc&component=general\n" +"POT-Creation-Date: 2010-08-27 17:39+0000\n" +"PO-Revision-Date: 2010-12-29 13:03-0300\n" +"Last-Translator: Mateus Zenaide \n" "Language-Team: Brazilian Portuguese Team \n" "MIME-Version: 1.0\n" @@ -49,11 +49,12 @@ msgid "Cannot create Avahi service browser." msgstr "Não foi possível criar o navegador do serviço Avahi." -#: ../libepc/shell.c:465 -msgid "Operation Proceeded" -msgstr "Operação procedida" - +#. Translators: This is just a generic default message for a progress bar. #: ../libepc/shell.c:467 +msgid "Operation in Progress" +msgstr "Operação em progresso" + +#: ../libepc/shell.c:471 msgid "No details known" msgstr "Sem detalhes" @@ -137,11 +138,11 @@ msgid "Anonymous Authentication" msgstr "Autenticação anônima" -#: ../libepc-ui/password-dialog.c:205 +#: ../libepc-ui/password-dialog.c:210 #, c-format msgid "Data source %s requires authentication before permitting access." msgstr "Fonte de dados %s requer autenticação antes de permitir acesso." -#: ../libepc-ui/password-dialog.c:208 +#: ../libepc-ui/password-dialog.c:213 msgid "Authentication required." msgstr "Autenticação necessária." diff -Nru libepc-0.3.11/po/ru.po libepc-0.4.2/po/ru.po --- libepc-0.3.11/po/ru.po 1970-01-01 00:00:00.000000000 +0000 +++ libepc-0.4.2/po/ru.po 2011-08-31 12:03:24.000000000 +0000 @@ -0,0 +1,137 @@ +# Russian translation for libepc. +# Copyright (C) 2011 libepc's COPYRIGHT HOLDER +# This file is distributed under the same license as the libepc package. +# Yuri Myasoedov , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: libepc master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libepc&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-06-15 10:00+0000\n" +"PO-Revision-Date: 2011-07-28 11:23+0300\n" +"Last-Translator: Yuri Myasoedov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../libepc/consumer.c:1083 +#, c-format +msgid "Unexpected element: '%s'" +msgstr "Неожиданный элемент: «%s»" + +#: ../libepc/publisher.c:663 +msgid "Table of Contents" +msgstr "Оглавление" + +#: ../libepc/publisher.c:697 +msgid "Sorry, no resources published yet." +msgstr "Извините, ресурсы ещё не опубликованы." + +#: ../libepc/publisher.c:2642 +msgid "%a of %u on %h" +msgstr "%a из %u на %h" + +#: ../libepc/shell.c:272 +#, c-format +msgid "Cannot create Avahi client: %s" +msgstr "Не удалось создать клиент Avahi: %s" + +#: ../libepc/shell.c:384 +#, c-format +msgid "Cannot create Avahi service browser." +msgstr "Не удалось создать браузер службы Avahi." + +#. Translators: This is just a generic default message for a progress bar. +#: ../libepc/shell.c:472 +msgid "Operation in Progress" +msgstr "Выполнение операции" + +#: ../libepc/shell.c:476 +msgid "No details known" +msgstr "Подробности неизвестны" + +#: ../libepc/tls.c:170 +msgid "Generating Server Key" +msgstr "Генерирование серверного ключа" + +#: ../libepc/tls.c:171 +msgid "This may take some time. Type on the keyboard, move your mouse, or browse the web to generate some entropy." +msgstr "Это может занять некоторое время. Нажмите клавишу на клавиатуре, переместите мышь или откройте веб-страницу, чтобы создать немного энтропии." + +#: ../libepc/tls.c:196 +#, c-format +msgid "Cannot create private server key: %s" +msgstr "Не удалось создать личный серверный ключ: %s" + +#: ../libepc/tls.c:249 +#, c-format +msgid "Cannot import private server key '%s': %s" +msgstr "Не удалось импортировать серверный ключ «%s»: %s" + +#: ../libepc/tls.c:305 +#, c-format +msgid "Cannot export private key to PEM format: %s" +msgstr "Не удалось экспортировать личный ключ в формат PEM: %s" + +#: ../libepc/tls.c:319 +#, c-format +msgid "Failed to create private key folder '%s': %s" +msgstr "Не удалось создать папку личного ключа «%s»: %s" + +#: ../libepc/tls.c:335 +#, c-format +msgid "Failed to create private key file '%s': %s" +msgstr "Не удалось создать файл личного ключа «%s»: %s" + +#: ../libepc/tls.c:349 +#, c-format +msgid "Failed to write private key file '%s': %s" +msgstr "Не удалось записать файл личного ключа «%s»: %s" + +#: ../libepc/tls.c:421 +#, c-format +msgid "Cannot create self signed server key for '%s': %s" +msgstr "Не удалось создать самозаверенный серверный ключ для «%s»: %s" + +#: ../libepc/tls.c:475 +#, c-format +msgid "Cannot import server certificate '%s': %s" +msgstr "Не удалось импортировать сертификат сервера «%s»: %s" + +#: ../libepc/tls.c:530 +#, c-format +msgid "Cannot export server certificate to PEM format: %s" +msgstr "Не удалось экспортировать сертификат сервера в формат PEM: %s" + +#: ../libepc/tls.c:544 +#, c-format +msgid "Failed to create server certificate folder '%s': %s" +msgstr "Не удалось создать папку сервера сертификации «%s»: %s" + +#: ../libepc-ui/password-dialog.c:106 +msgid "Authentication required." +msgstr "Требуется аутентификация." + +#: ../libepc-ui/password-dialog.c:117 +msgid "_Username:" +msgstr "_Имя пользователя:" + +#: ../libepc-ui/password-dialog.c:123 +msgid "_Password:" +msgstr "_Пароль:" + +#: ../libepc-ui/password-dialog.c:129 +msgid "Anonymous Authentication" +msgstr "Анонимная аутентификация" + +#: ../libepc-ui/password-dialog.c:214 +#, c-format +msgid "Data source %s requires authentication before permitting access." +msgstr "Для получения доступа к источнику данных %s требуется аутентификация." + +#: ../libepc-ui/password-dialog.c:217 +msgid "Authentication required." +msgstr "Требуется аутентификация." + diff -Nru libepc-0.3.11/po/sl.po libepc-0.4.2/po/sl.po --- libepc-0.3.11/po/sl.po 2010-01-20 10:15:43.000000000 +0000 +++ libepc-0.4.2/po/sl.po 2010-12-16 09:39:49.000000000 +0000 @@ -1,13 +1,15 @@ -# This file is distributed under the same license as the package. +# Slovenian translation for libepc. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the libepc package. # # Matej Urbančič , 2008 - 2010. # msgid "" msgstr "" -"Project-Id-Version: libepc\n" +"Project-Id-Version: libepc master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libepc&component=general\n" "POT-Creation-Date: 2009-11-11 17:20+0000\n" -"PO-Revision-Date: 2010-01-05 09:49+0100\n" +"PO-Revision-Date: 2010-04-24 08:06+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "MIME-Version: 1.0\n" @@ -21,7 +23,7 @@ #: ../libepc/consumer.c:1079 #, c-format msgid "Unexpected element: '%s'" -msgstr "Nepričakovan element: '%s'" +msgstr "Nepričakovan predmet: '%s'" #: ../libepc/publisher.c:659 msgid "Table of Contents" @@ -135,5 +137,4 @@ #: ../libepc-ui/password-dialog.c:208 msgid "Authentication required." -msgstr "Zahtevana je overitev." - +msgstr "Zahtevana je overitev." \ No newline at end of file diff -Nru libepc-0.3.11/po/th.po libepc-0.4.2/po/th.po --- libepc-0.3.11/po/th.po 2009-09-04 10:08:24.000000000 +0000 +++ libepc-0.4.2/po/th.po 2011-03-29 08:53:30.000000000 +0000 @@ -1,16 +1,16 @@ # Thai translation of libepc. -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009-2011 Free Software Foundation, Inc. # This file is distributed under the same license as the libepc package. -# Akom C. , 2009. +# Akom Chotiphantawanon , 2009-2011. # msgid "" msgstr "" "Project-Id-Version: libepc\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=libepc&component=general\n" -"POT-Creation-Date: 2009-02-07 17:02+0000\n" -"PO-Revision-Date: 2009-03-23 11:46+0700\n" -"Last-Translator: Akom C. \n" +"POT-Creation-Date: 2010-12-29 16:30+0000\n" +"PO-Revision-Date: 2011-01-09 21:13+0700\n" +"Last-Translator: Akom Chotiphantawanon \n" "Language-Team: Thai \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -43,11 +43,12 @@ msgid "Cannot create Avahi service browser." msgstr "ไม่สามารถสร้างเบราว์เซอร์บริการของ Avahi ได้" -#: ../libepc/shell.c:465 -msgid "Operation Proceeded" -msgstr "ดำเนินการการกระทำแล้ว" - +#. Translators: This is just a generic default message for a progress bar. #: ../libepc/shell.c:467 +msgid "Operation in Progress" +msgstr "กำลังทำงาน" + +#: ../libepc/shell.c:471 msgid "No details known" msgstr "ไม่ทราบรายละเอียด" @@ -127,11 +128,11 @@ msgid "Anonymous Authentication" msgstr "การยืนยันตัวบุคคลนิรนาม" -#: ../libepc-ui/password-dialog.c:205 +#: ../libepc-ui/password-dialog.c:210 #, c-format msgid "Data source %s requires authentication before permitting access." msgstr "แหล่งข้อมูล %s ต้องยืนยันตัวบุคคลก่อนอนุญาตให้เข้าใช้" -#: ../libepc-ui/password-dialog.c:208 +#: ../libepc-ui/password-dialog.c:213 msgid "Authentication required." msgstr "ต้องยืนยันตัวบุคคล"