diff -Nru xfconf-4.8.0/aclocal.m4 xfconf-4.8.1/aclocal.m4 --- xfconf-4.8.0/aclocal.m4 2011-01-16 14:51:54.000000000 +0000 +++ xfconf-4.8.1/aclocal.m4 2011-12-23 16:05:13.000000000 +0000 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, -[m4_warning([this file was generated for autoconf 2.66. +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'.])]) @@ -260,6 +260,10 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -460,6 +464,7 @@ 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 @@ -487,6 +492,11 @@ 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 $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]) @@ -711,8 +721,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -721,8 +731,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -856,6 +866,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -878,10 +890,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 @@ -1338,7 +1353,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -1452,15 +1467,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" ], @@ -1505,6 +1517,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -1526,6 +1539,29 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -1556,6 +1592,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -1658,7 +1698,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1666,6 +1712,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1677,6 +1724,7 @@ [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 @@ -1694,7 +1742,9 @@ 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 + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1739,8 +1789,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1751,6 +1801,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported 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\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1777,30 +1829,41 @@ 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 @@ -1825,7 +1888,7 @@ 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 && \ +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 @@ -1869,6 +1932,39 @@ ])# _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], @@ -1990,14 +2086,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -2015,14 +2124,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=: @@ -2041,13 +2183,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -2227,6 +2369,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -2266,7 +2413,7 @@ # 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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2362,10 +2509,10 @@ /* 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)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -2812,7 +2959,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2821,7 +2968,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2886,7 +3033,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -2905,8 +3052,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}`~ @@ -2939,13 +3087,71 @@ 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 ;; @@ -2966,7 +3172,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2974,10 +3180,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2985,7 +3187,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -3003,7 +3205,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -3023,17 +3225,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -3094,7 +3297,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -3110,7 +3313,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -3147,9 +3350,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3178,14 +3381,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # 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;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -3216,7 +3415,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3285,7 +3484,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3310,7 +3509,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3334,7 +3533,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -3365,7 +3564,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3375,7 +3574,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3653,6 +3852,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' @@ -3792,7 +3996,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3871,6 +4075,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 @@ -3878,7 +4097,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 @@ -3981,6 +4204,67 @@ 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' + +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 # -------- @@ -4107,8 +4391,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= @@ -4132,6 +4416,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4144,6 +4429,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 @@ -4177,6 +4463,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 @@ -4188,7 +4486,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; } @@ -4214,15 +4512,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 @@ -4255,6 +4553,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], @@ -4265,6 +4570,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 @@ -4276,7 +4583,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 @@ -4381,6 +4687,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++*) @@ -4689,7 +5001,9 @@ 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' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4755,6 +5069,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; + 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) @@ -4775,18 +5095,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # 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)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4874,9 +5209,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. @@ -4895,6 +5232,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. # @@ -4915,6 +5254,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 @@ -4923,6 +5263,7 @@ 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. @@ -4937,15 +5278,22 @@ ;; 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(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= @@ -4960,7 +5308,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5113,7 +5460,8 @@ _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' @@ -5161,7 +5509,7 @@ 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 @@ -5210,8 +5558,7 @@ 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _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~ @@ -5231,8 +5578,8 @@ _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 ;; @@ -5250,8 +5597,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 @@ -5297,8 +5644,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 @@ -5428,7 +5775,7 @@ _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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else @@ -5439,7 +5786,7 @@ 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. @@ -5483,20 +5830,64 @@ # 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 `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(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(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _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*) @@ -5509,10 +5900,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5525,7 +5912,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5534,7 +5921,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 @@ -5542,7 +5929,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 @@ -5558,13 +5945,12 @@ hpux10*) if test "$GCC" = yes && test "$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' + _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 if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5582,10 +5968,10 @@ _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 @@ -5632,16 +6018,31 @@ 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" && 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 $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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${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" && 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' @@ -5726,7 +6127,7 @@ 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" && 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${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 \*' @@ -5745,9 +6146,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"*) @@ -5991,9 +6392,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -6019,8 +6417,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], @@ -6031,6 +6427,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 @@ -6128,6 +6526,7 @@ m4_defun([_LT_LANG_CXX_CONFIG], [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 @@ -6146,7 +6545,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6189,6 +6587,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 @@ -6206,6 +6605,7 @@ fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -6227,8 +6627,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' @@ -6369,7 +6769,7 @@ _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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -6381,7 +6781,7 @@ 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. @@ -6423,29 +6823,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(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 - ;; + 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) ;; @@ -6468,7 +6914,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6520,7 +6966,7 @@ ;; *) 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 @@ -6591,10 +7037,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 @@ -6635,9 +7081,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" && 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 $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" && func_echo_all "${wl}-set_version ${wl}$verstring"` -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 @@ -6915,7 +7361,7 @@ _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" && 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 $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 @@ -7002,9 +7448,9 @@ 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 @@ -7133,6 +7579,7 @@ fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -7147,6 +7594,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 @@ -7155,6 +7625,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)= @@ -7204,7 +7675,20 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then @@ -7216,7 +7700,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. @@ -7225,13 +7709,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. @@ -7251,8 +7744,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. @@ -7288,6 +7783,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], @@ -7387,7 +7883,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7437,7 +7932,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]) @@ -7491,6 +7988,7 @@ GCC=$lt_save_GCC CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" fi # test "$_lt_disable_F77" != yes AC_LANG_POP @@ -7517,7 +8015,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7567,7 +8064,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 @@ -7623,7 +8122,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 @@ -7660,10 +8160,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" @@ -7690,10 +8192,78 @@ AC_LANG_RESTORE GCC=$lt_save_GCC -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7725,9 +8295,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]) @@ -7740,7 +8312,8 @@ GCC=$lt_save_GCC AC_LANG_RESTORE -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_RC_CONFIG @@ -7760,6 +8333,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -7799,6 +8379,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 # ------------ @@ -7890,8 +8479,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 @@ -7930,209 +8519,165 @@ ])# _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=$(( $[*] )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} +# _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=: +]) -_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 "${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 -} +# _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]) -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${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_dirname_and_basename], [dnl + 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_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 -} + _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}"}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) + + _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"}]) + + _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 "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED '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 # Helper functions for option handling. -*- Autoconf -*- # @@ -8459,9 +9004,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) @@ -8631,17 +9191,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 3175 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.10]) -m4_define([LT_PACKAGE_REVISION], [1.3175]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.10' -macro_revision='1.3175' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -8806,7 +9366,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +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]) @@ -8852,7 +9413,8 @@ 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 @@ -8900,9 +9462,9 @@ 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 "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $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 @@ -8915,7 +9477,7 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT]) +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -8926,7 +9488,7 @@ _PKG_TEXT -To get pkg-config, see .]) +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -10004,19 +10566,19 @@ dnl dnl Written for Xfce by Benedikt Meurer . dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms of the GNU General Public License as published by the Free -dnl Software Foundation; either version 2 of the License, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but WITHOUT -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -dnl more details. -dnl -dnl You should have received a copy of the GNU General Public License along with -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple -dnl Place, Suite 330, Boston, MA 02111-1307 USA +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. dnl dnl xdt-depends dnl ----------- @@ -10042,11 +10604,23 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) + m4_ifdef([PKG_PROG_PKG_CONFIG], + [ + PKG_PROG_PKG_CONFIG([$xdt_cv_PKG_CONFIG_MIN_VERSION]) - if test x"$PKG_CONFIG" = x"no"; then + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + ], + [ + echo echo "*** The pkg-config utility could not be found on your system." echo "*** Make sure it is in your path, or set the PKG_CONFIG" echo "*** environment variable to the full path to pkg-config." @@ -10056,25 +10630,7 @@ echo "*** http://www.freedesktop.org/software/pkgconfig" echo "***" exit 1 - fi - - # check pkg-config version - AC_MSG_CHECKING([for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION]) - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION]) - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION]) - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi - fi + ]) ]) @@ -10434,19 +10990,19 @@ dnl dnl Written for Xfce by Benedikt Meurer . dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms of the GNU General Public License as published by the Free -dnl Software Foundation; either version 2 of the License, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but WITHOUT -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -dnl more details. -dnl -dnl You should have received a copy of the GNU General Public License along with -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple -dnl Place, Suite 330, Boston, MA 02111-1307 USA +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. dnl dnl xdt-depends dnl ----------- @@ -10503,17 +11059,25 @@ -Wno-missing-field-initializers \ -Wno-unused-parameter -Wold-style-definition \ -Wdeclaration-after-statement \ - -Wmissing-declarations -Wredundant-decls \ + -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ -Wcast-align -Wformat-security \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs \ - -fstack-protector" + -Wmissing-format-attribute -Wnested-externs" CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" - + + if test x`uname` = x"Linux"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" + fi + + dnl # signal.h inline is crapy on openbsd + if test x`uname` != x"OpenBSD"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls" + fi + if test x"$enable_debug" = x"full"; then AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support]) - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g3 -Werror" + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror" CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" AC_MSG_RESULT([full]) else @@ -10593,7 +11157,11 @@ if test "x$have_gnuc_visibility" = "xyes"; then CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY" - XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden]) + xdt_vis_hidden_cflags="" + XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-xldscope=hidden]) + if test "x$xdt_vis_hidden_cflags" = "x"; then + XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden]) + fi CFLAGS="$CFLAGS $xdt_vis_hidden_cflags" fi @@ -10612,16 +11180,18 @@ [enable_linker_opts=$enableval], [enable_linker_opts=yes]) if test "x$enable_linker_opts" != "xno"; then - AC_MSG_CHECKING([whether $LD accepts --as-needed]) - case `$LD --as-needed -v 2>&1 &1 &1 . dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms of the GNU General Public License as published by the Free -dnl Software Foundation; either version 2 of the License, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but WITHOUT -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -dnl more details. -dnl -dnl You should have received a copy of the GNU General Public License along with -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple -dnl Place, Suite 330, Boston, MA 02111-1307 USA +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. dnl dnl xdt-i18n dnl -------- diff -Nru xfconf-4.8.0/ChangeLog xfconf-4.8.1/ChangeLog --- xfconf-4.8.0/ChangeLog 2011-01-16 14:52:20.000000000 +0000 +++ xfconf-4.8.1/ChangeLog 2011-12-23 16:05:22.000000000 +0000 @@ -1,3 +1,455 @@ +commit 8aed66350d654f2ae84a9531a4c5f62561094a73 +Author: Nick Schermer +Date: Fri Dec 23 17:05:03 2011 +0100 + + Updates for release. + +commit 66256cd753152ab7632654996843ef10b257b713 +Author: Guido Berhoerster +Date: Sat Feb 12 17:41:59 2011 +0100 + + Allow installation of the helpers in a custom location. + + (cherry picked from commit 3cd8ae19d1ea83d0c24795e4da1cc25ebefefab3) + +commit 98d7172cd548497322478caf8f8b2534e0868bb7 +Author: Nick Schermer +Date: Fri Apr 22 20:39:45 2011 +0200 + + Avoid gcc 4.6 compiler warning. + + (cherry picked from commit 16066bea47e26e342be40d5ac2745bf5eb3958d1) + +commit 1e89ed2cce441cd0af0c987dac7010e74bbe942d +Author: Nick Schermer +Date: Sun Mar 27 13:56:12 2011 +0200 + + Fix compiler warnings on solaris. + + (cherry picked from commit a9629255ab6a75b6ad4b4d577335debceed02fe5) + +commit 2a4673e1dae7d766d095582b47aa2b1c31e3de71 +Author: Olivier Fourdan +Date: Tue Dec 20 10:57:27 2011 +0100 + + Fix double free crash (bug #8169). + + In xfconf_cache_set_property_reply_handler() if the item is not found in + cache->properties, the function exit (goto out;) without removing the + old_property from cache->old_properties nor the call from cache->pending_calls. + + Then when xfconf_cache_set() is called, the old_item is still found in the hash + (as it wasn't removed previously) and therefore dbus_g_proxy_cancel_call() is + called in a call which was completed, thus leading to the double-free and the + crash. + (cherry picked from commit cdcbb6a3a68e9645f6b286d8cb0c420e378261c1) + +commit dbf5d4eda87437b7492aa9fcbbe8421e9e8e9ac1 +Author: Kristófer Arnþórsson +Date: Tue Dec 6 11:33:50 2011 +0100 + + l10n: Updated Icelandic (is) translation to 17% + + New status: 11 messages complete with 3 fuzzies and 49 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 73b8928efdb00c0f2492774b1ce6782cb2268632 +Author: Kristófer Arnþórsson +Date: Mon Dec 5 09:03:00 2011 +0100 + + l10n: Updated Icelandic (is) translation to 15% + + New status: 10 messages complete with 0 fuzzies and 53 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b67165c2f67a4f21de46cce19a2848ce99d11f91 +Author: Sveinn í Felli +Date: Sat Dec 3 08:54:33 2011 +0100 + + l10n: sett inn ef einhver hefur nennu til að þýða þetta + + New status: 2 messages complete with 0 fuzzies and 61 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 64cde8c8ce80fac564791b097416ea23d896861f +Author: Chipong Luo +Date: Fri Dec 2 16:34:19 2011 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit db7093b255b298a9487607bdd700ebf7ecb6fe2f +Author: Mohd. Nadzrin Sapari +Date: Sat Nov 19 13:01:54 2011 +0100 + + l10n: Update to Malay translation + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ce3f36e9d148aca8185f04ce2b59ebce57f51531 +Author: Ivica Kolić +Date: Sat Nov 5 17:30:06 2011 +0100 + + l10n: Updates to Croatian (hr) translation + + New status: 40 messages complete with 0 fuzzies and 23 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 675203ffab432feb9b742c67b5f9dd6abef53f51 +Author: Ivica Kolić +Date: Sat Nov 5 16:33:21 2011 +0100 + + l10n: Initial Croatian (hr) translation + + New status: 31 messages complete with 11 fuzzies and 21 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ad84971ca76c8d20129bfa00d49745c387d66c4a +Author: Ivica Kolić +Date: Sat Nov 5 16:31:42 2011 +0100 + + l10n: Updated Croatian (hr) translation to None% + + New status: 0 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8e2db998a84757eeeb1755c1bf8c843a52d1891c +Author: Ivica Kolić +Date: Sat Nov 5 16:28:37 2011 +0100 + + l10n: Initial Croatian (hr) translation + + New status: 31 messages complete with 11 fuzzies and 21 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 303b085233e1dc9b954bc350d908d087cf2a9c83 +Author: Ivica Kolić +Date: Sat Nov 5 16:27:04 2011 +0100 + + l10n: Updated Croatian (hr) translation to None% + + New status: 0 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit cd95687877dac261722ba7409d7a56a6c7d0d138 +Author: Ivica Kolić +Date: Sat Nov 5 16:22:58 2011 +0100 + + l10n: initial Croatian (hr) translation + + New status: 31 messages complete with 11 fuzzies and 21 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 13a70f5cd67b6d4149f68d7238f5d824e06f9b30 +Author: Chipong Luo +Date: Mon Oct 17 16:47:36 2011 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5888f23b358498c530e32c6679bf96f699b7a44c +Author: Chipong Luo +Date: Mon Oct 17 14:44:15 2011 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b0ccb5ec59a0cec406f1776fa3e95276fbe129f3 +Author: Chipong Luo +Date: Mon Oct 10 03:13:07 2011 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8f2c977640126f04cf4ff287acc9160a2806f122 +Author: Seong-ho Cho +Date: Mon Sep 12 16:50:50 2011 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d30d5cd22fcf812c64c096c7427208076532c0ad +Author: Pjotr Anon +Date: Wed Sep 7 21:09:57 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1fb61c58cf55d9b943e73c6376993a0ca85c9d5a +Author: Alexandr Boltris +Date: Fri Aug 26 16:38:27 2011 +0200 + + l10n: Updated Russian (ru) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b8fd0fd0fede4029a52e96256803a5974d828c49 +Author: Alexandr Boltris +Date: Fri Aug 26 08:47:35 2011 +0200 + + l10n: Updated Russian (ru) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit dc74d73b771d2ddf14db14c51aa2b7f77c64f409 +Author: Praveen Illa +Date: Mon Aug 22 22:10:48 2011 +0200 + + l10n: Updates to Telugu translation + + New status: 20 messages complete with 0 fuzzies and 47 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 96cc2fa3814110710f5d218cadaae8bfd81fa4b9 +Author: Artem Zolochevskiy +Date: Wed Aug 17 14:17:03 2011 +0200 + + l10n: Updated Russian (ru) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6a794c201dc97aa484eaf8b82b95b9cd0109c5fb +Author: Artem Zolochevskiy +Date: Wed Aug 17 13:50:02 2011 +0200 + + l10n: Updated Russian (ru) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 58ed641e207b26294b92348774b206b7d32ff35a +Author: Seong-ho Cho +Date: Fri Jul 29 11:12:08 2011 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 92ee06ed9437802f4fb6b437939d2d739f398403 +Author: Seong-ho Cho +Date: Fri Jul 29 10:50:29 2011 +0200 + + l10n: Updated Korean (ko) translation to 3% + + New status: 2 messages complete with 0 fuzzies and 61 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6e95480e02c89d57004e52e629cf943db6799720 +Author: Seong-ho Cho +Date: Thu Jul 28 19:17:54 2011 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1b05ee1626a6321dc224bd890e970618030f9fd4 +Author: Seong-ho Cho +Date: Thu Jul 28 18:52:24 2011 +0200 + + l10n: Updates to Korean translation + + New status: 2 messages complete with 0 fuzzies and 61 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit bcb18e843c36ab73ec5230f8e5ee9f16ac134faf +Author: Artem Zolochevskiy +Date: Wed Jul 20 09:56:06 2011 +0200 + + l10n: Updated Russian (ru) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d6babd9fd2740264afa05e7fc7e667147977a782 +Author: Artem Zolochevskiy +Date: Wed Jul 20 09:50:12 2011 +0200 + + l10n: Updated Russian (ru) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 222ed5a6340759b54567d5df94884eec6f38b7a9 +Author: Pjotr Anon +Date: Fri Jun 17 13:18:23 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 95761a9093af95189d7dea1a4ebbc5a4caad562c +Author: Tomáš Vadina +Date: Fri Jun 10 10:11:48 2011 +0200 + + l10n: Updated Slovak (sk) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit cf552c45979c1c41c43327157f7ebbf98d5e4b98 +Author: Tomáš Vadina +Date: Fri Jun 10 10:08:55 2011 +0200 + + l10n: Updated Slovak (sk) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a99b365eb808d866aae2cb0a2be36040f68a751d +Author: Tomáš Vadina +Date: Fri Jun 10 10:06:55 2011 +0200 + + l10n: Updated Slovak (sk) translation to 100% + + New status: 679 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit eca0a37fb560590325b43b19ca89616eb4ffaf0d +Author: Pjotr Anon +Date: Fri May 27 12:21:57 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b1f6562621508c511e7389b8ade5333e0aefb9cf +Author: Pjotr Anon +Date: Thu May 26 22:58:08 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 608397bd27cc4c934fbc1b2c3ebbad09ef712a4d +Author: Pjotr Anon +Date: Sat May 14 00:05:42 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a5f62c9b2b49f2430bb5022ee1068027adca0492 +Author: Pjotr Anon +Date: Fri May 13 15:19:43 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2a27ba96a9aa5b8192721c4d750e21195ffafda6 +Author: Pjotr Anon +Date: Mon May 9 21:46:55 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit bca10052d2878f78836e86c39246ff35e2ef89aa +Author: Pjotr Anon +Date: Mon May 9 12:17:44 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d0c31109667ec2bd8e26a3635959bedbc67281d2 +Author: necdetyucel +Date: Sun Mar 20 23:11:44 2011 +0100 + + l10n: Updated Turkish (tr) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6b5b470d95bc9bcea62c71d8882600f8a74f472f +Author: necdetyucel +Date: Fri Mar 18 22:03:02 2011 +0100 + + l10n: Updated Turkish (tr) translation to 98% + + New status: 62 messages complete with 0 fuzzies and 1 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit eb8f960db49199fe3f4c3a8c42a736e55a25dab6 +Author: Robert Hartl +Date: Mon Jan 31 15:00:33 2011 +0100 + + l10n: Updated Slovak (sk) translation to 100% + + New status: 63 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e32194e64c621c2aedb4d24b091bfc05adfde889 +Author: Jannis Pohlmann +Date: Sun Jan 16 15:55:57 2011 +0100 + + Release 4.8.0! + commit 75c5ad2775806aea35a90c5f4b9162003c809076 Author: كريم أولاد الشلحة Date: Sat Jan 15 21:13:57 2011 +0100 diff -Nru xfconf-4.8.0/common/Makefile.in xfconf-4.8.1/common/Makefile.in --- xfconf-4.8.0/common/Makefile.in 2011-01-16 14:51:55.000000000 +0000 +++ xfconf-4.8.1/common/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -126,6 +126,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -143,9 +144,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -174,6 +178,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -219,6 +224,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@ diff -Nru xfconf-4.8.0/configure xfconf-4.8.1/configure --- xfconf-4.8.0/configure 2011-01-16 14:51:57.000000000 +0000 +++ xfconf-4.8.1/configure 2011-12-23 16:05:16.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.66 for xfconf 4.8.0. +# Generated by GNU Autoconf 2.68 for xfconf 4.8.1. # # Report bugs to . # @@ -91,6 +91,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -224,11 +225,18 @@ # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -562,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='xfconf' PACKAGE_TARNAME='xfconf' -PACKAGE_VERSION='4.8.0' -PACKAGE_STRING='xfconf 4.8.0' +PACKAGE_VERSION='4.8.1' +PACKAGE_STRING='xfconf 4.8.1' PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' PACKAGE_URL='' @@ -624,8 +632,8 @@ GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH +GTKDOC_DEPS_LIBS +GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE @@ -653,6 +661,8 @@ GLIB_LIBS GLIB_CFLAGS GLIB_VERSION +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG XGETTEXT_ARGS MKINSTALLDIRS @@ -705,8 +715,11 @@ LIPO NMEDIT DSYMUTIL +MANIFEST_TOOL RANLIB +ac_ct_AR AR +DLLTOOL OBJDUMP LN_S NM @@ -743,6 +756,7 @@ LDFLAGS CFLAGS CC +HELPER_PATH_PREFIX AM_BACKSLASH AM_DEFAULT_VERBOSITY MAINT @@ -814,12 +828,14 @@ enable_option_checking enable_maintainer_mode enable_silent_rules +with_helper_path_prefix enable_dependency_tracking enable_shared enable_static with_pic enable_fast_install with_gnu_ld +with_sysroot enable_libtool_lock enable_nls with_locales_dir @@ -846,7 +862,9 @@ CPP PKG_CONFIG PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR' +PKG_CONFIG_LIBDIR +GTKDOC_DEPS_CFLAGS +GTKDOC_DEPS_LIBS' # Initialize some variables set by options. @@ -909,8 +927,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. @@ -1250,7 +1269,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 @@ -1388,7 +1407,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 xfconf 4.8.0 to adapt to many kinds of systems. +\`configure' configures xfconf 4.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1458,7 +1477,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfconf 4.8.0:";; + short | recursive ) echo "Configuration of xfconf 4.8.1:";; esac cat <<\_ACEOF @@ -1496,9 +1515,14 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-helper-path-prefix=PATH + Path prefix under which helper executables will be + installed (default: $libdir) + --with-pic[=PKGS] 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-locales-dir=DIR Install locales into DIR @@ -1521,6 +1545,10 @@ 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 Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1588,8 +1616,8 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfconf configure 4.8.0 -generated by GNU Autoconf 2.66 +xfconf configure 4.8.1 +generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1635,7 +1663,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1661,7 +1689,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1672,7 +1700,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1685,10 +1713,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + 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 "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1724,7 +1752,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1755,7 +1783,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1764,7 +1792,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1805,7 +1833,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1819,7 +1847,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1837,7 +1865,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1882,7 +1910,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1895,7 +1923,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1950,7 +1978,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -2127,7 +2155,7 @@ rm -f conftest.val fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_compute_int @@ -2135,8 +2163,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfconf $as_me 4.8.0, which was -generated by GNU Autoconf 2.66. Invocation command line was +It was created by xfconf $as_me 4.8.1, which was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2533,7 +2561,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2710,7 +2738,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2750,7 +2778,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2803,7 +2831,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2854,7 +2882,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2894,7 +2922,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2952,7 +2980,7 @@ # Define the identity of the package. PACKAGE='xfconf' - VERSION='4.8.0' + VERSION='4.8.1' cat >>confdefs.h <<_ACEOF @@ -3060,7 +3088,7 @@ done rm -rf conftest.dir -if test "${am_cv_prog_tar_ustar+set}" = set; then : +if ${am_cv_prog_tar_ustar+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_ustar=$_am_tool @@ -3111,6 +3139,16 @@ AM_BACKSLASH='\' + +# Check whether --with-helper-path-prefix was given. +if test "${with_helper_path_prefix+set}" = set; then : + withval=$with_helper_path_prefix; HELPER_PATH_PREFIX="$withval" +else + HELPER_PATH_PREFIX="$libdir" +fi + + + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -3183,7 +3221,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3223,7 +3261,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3276,7 +3314,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3316,7 +3354,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3375,7 +3413,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3419,7 +3457,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3702,7 +3740,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3753,7 +3791,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3790,7 +3828,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3868,7 +3906,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3967,7 +4005,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4103,7 +4141,7 @@ CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -4133,7 +4171,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4149,11 +4187,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4192,7 +4230,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4208,11 +4246,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else @@ -4231,7 +4269,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4294,7 +4332,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4361,7 +4399,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4490,7 +4528,7 @@ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = x""yes; then : +if test "x$ac_cv_header_minix_config_h" = xyes; then : MINIX=yes else MINIX= @@ -4512,7 +4550,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : +if ${ac_cv_safe_to_define___extensions__+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4552,7 +4590,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 $as_echo_n "checking for library containing strerror... " >&6; } -if test "${ac_cv_search_strerror+set}" = set; then : +if ${ac_cv_search_strerror+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -4586,11 +4624,11 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_strerror+set}" = set; then : + if ${ac_cv_search_strerror+:} false; then : break fi done -if test "${ac_cv_search_strerror+set}" = set; then : +if ${ac_cv_search_strerror+:} false; then : else ac_cv_search_strerror=no @@ -4618,7 +4656,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4658,7 +4696,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4711,7 +4749,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4751,7 +4789,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4810,7 +4848,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4854,7 +4892,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4938,7 +4976,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4975,7 +5013,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -5053,7 +5091,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -5152,7 +5190,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -5284,7 +5322,7 @@ fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5410,8 +5448,8 @@ -macro_version='2.2.10' -macro_revision='1.3175' +macro_version='2.4.2' +macro_revision='1.3337' @@ -5433,7 +5471,7 @@ { $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 @@ -5467,7 +5505,7 @@ { $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 @@ -5522,7 +5560,7 @@ { $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 && \ +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 @@ -5569,7 +5607,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -5651,7 +5689,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then : +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -5782,7 +5820,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then : +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -5822,7 +5860,7 @@ 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. @@ -5849,7 +5887,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then : +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -5912,7 +5950,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : +if ${ac_cv_prog_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -5956,7 +5994,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_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 @@ -6028,7 +6066,7 @@ { $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" @@ -6063,7 +6101,7 @@ # find the maximum length of command line arguments { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then : +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 @@ -6126,6 +6164,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -6165,7 +6208,7 @@ # 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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -6208,8 +6251,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 @@ -6258,9 +6301,83 @@ +{ $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' @@ -6274,6 +6391,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' @@ -6296,7 +6418,7 @@ set dummy ${ac_tool_prefix}objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -6336,7 +6458,7 @@ set dummy objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -6395,7 +6517,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then : +if ${lt_cv_deplibs_check_method+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -6515,7 +6637,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -6597,6 +6719,21 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -6612,12 +6749,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 + 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 @@ -6630,7 +6920,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6650,14 +6940,18 @@ fi + test -n "$AR" && break + done fi -if test -z "$ac_cv_prog_AR"; then +if test -z "$AR"; then ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -6670,7 +6964,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6689,6 +6983,10 @@ $as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then AR="false" else @@ -6700,16 +6998,72 @@ 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} + + + + + + + + + +{ $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 @@ -6722,7 +7076,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -6762,7 +7116,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -6821,7 +7175,7 @@ set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then : +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -6861,7 +7215,7 @@ set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -6923,13 +7277,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -6990,7 +7344,7 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7051,8 +7405,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= @@ -7076,6 +7430,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -7088,6 +7443,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 @@ -7129,6 +7485,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 @@ -7140,7 +7508,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; } @@ -7166,8 +7534,8 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 @@ -7177,8 +7545,8 @@ test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -7215,6 +7583,20 @@ $as_echo "ok" >&6; } fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + + + + + @@ -7234,6 +7616,41 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + # Check whether --enable-libtool-lock was given. @@ -7361,7 +7778,7 @@ CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then : +if ${lt_cv_cc_needs_belf+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -7402,7 +7819,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -7413,7 +7830,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7429,19 +7859,16 @@ need_locks="$enable_libtool_lock" - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +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 test "${ac_cv_prog_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. + if test -n "$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 @@ -7450,7 +7877,127 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -7477,7 +8024,7 @@ set dummy dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -7529,7 +8076,7 @@ set dummy ${ac_tool_prefix}nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then : +if ${ac_cv_prog_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -7569,7 +8116,7 @@ set dummy nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -7621,7 +8168,7 @@ set dummy ${ac_tool_prefix}lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then : +if ${ac_cv_prog_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -7661,7 +8208,7 @@ set dummy lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -7713,7 +8260,7 @@ set dummy ${ac_tool_prefix}otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then : +if ${ac_cv_prog_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -7753,7 +8300,7 @@ set dummy otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -7805,7 +8352,7 @@ set dummy ${ac_tool_prefix}otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then : +if ${ac_cv_prog_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -7845,7 +8392,7 @@ set dummy otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -7920,7 +8467,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then : +if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -7936,7 +8483,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7947,9 +8500,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : +if ${lt_cv_ld_exported_symbols_list+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no @@ -7979,9 +8533,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } -if test "${lt_cv_ld_force_load+set}" = set; then : +if ${lt_cv_ld_force_load+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_force_load=no @@ -8000,7 +8555,9 @@ 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 + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8050,7 +8607,7 @@ do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = x""yes; then : +if test "x$ac_cv_header_dlfcn_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DLFCN_H 1 _ACEOF @@ -8138,7 +8695,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8216,6 +8788,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -8237,7 +8813,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then : +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -8315,7 +8891,7 @@ if test "$file_magic_cmd" = '$MAGIC_CMD'; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8381,7 +8957,7 @@ if test -n "$ac_tool_prefix"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8519,7 +9095,7 @@ { $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 @@ -8572,8 +9148,6 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -8673,7 +9247,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -8738,6 +9314,12 @@ lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; + 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) @@ -8758,18 +9340,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # 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='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -8857,13 +9454,17 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. @@ -8871,7 +9472,7 @@ if test -n "$lt_prog_compiler_pic"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -8924,13 +9525,18 @@ + + + + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then : +if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -8973,7 +9579,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9028,7 +9634,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9122,7 +9728,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9274,7 +9879,8 @@ 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' @@ -9322,7 +9928,7 @@ 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 @@ -9371,8 +9977,7 @@ 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' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 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~ @@ -9392,8 +9997,8 @@ 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 ;; @@ -9411,8 +10016,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 @@ -9458,8 +10063,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 @@ -9589,7 +10194,13 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9602,22 +10213,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -9629,7 +10247,13 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9642,22 +10266,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, @@ -9702,20 +10333,64 @@ # 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 `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' - 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 + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + 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*) @@ -9727,6 +10402,7 @@ hardcode_shlibpath_var=unsupported 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 @@ -9755,10 +10431,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -9771,7 +10443,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -9780,7 +10452,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 @@ -9788,7 +10460,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 @@ -9804,13 +10476,12 @@ hpux10*) if test "$GCC" = yes && test "$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' + 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 if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -9828,10 +10499,10 @@ 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 @@ -9848,7 +10519,7 @@ # (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 test "${lt_cv_prog_compiler__b+set}" = set; then : +if ${lt_cv_prog_compiler__b+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no @@ -9910,23 +10581,36 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $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' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int foo(void) {} +int foo (void) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && 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' @@ -10011,7 +10695,7 @@ 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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${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 \*' @@ -10030,9 +10714,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"*) @@ -10220,7 +10904,7 @@ # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : +if ${lt_cv_archive_cmds_need_lc+:} false; then : $as_echo_n "(cached) " >&6 else $RM conftest* @@ -10421,11 +11105,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10515,7 +11194,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10524,7 +11203,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10589,7 +11268,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -10608,8 +11287,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}`~ @@ -10642,13 +11322,71 @@ 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 ;; @@ -10669,7 +11407,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10677,10 +11415,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -10688,7 +11422,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10706,7 +11440,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10726,17 +11460,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -10797,7 +11532,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -10813,7 +11548,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -10850,9 +11585,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10862,7 +11597,7 @@ shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_shlibpath_overrides_runpath=no @@ -10900,14 +11635,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # 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;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10938,7 +11669,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11007,7 +11738,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11032,7 +11763,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -11056,7 +11787,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11087,7 +11818,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11097,7 +11828,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -11286,7 +12017,7 @@ # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11320,7 +12051,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -11334,12 +12065,12 @@ *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = x""yes; then : +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen="shl_load" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then : +if ${ac_cv_lib_dld_shl_load+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11373,16 +12104,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = x""yes; then : +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11416,12 +12147,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then : +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11455,12 +12186,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then : +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11494,7 +12225,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -11535,7 +12266,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then : +if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -11588,10 +12319,10 @@ /* 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)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -11641,7 +12372,7 @@ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then : +if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -11694,10 +12425,10 @@ /* 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)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -11879,6 +12610,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -11929,7 +12662,7 @@ set dummy intltool-update; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : +if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in @@ -11969,7 +12702,7 @@ set dummy intltool-merge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : +if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in @@ -12009,7 +12742,7 @@ set dummy intltool-extract; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : +if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in @@ -12170,7 +12903,7 @@ set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case $XGETTEXT in @@ -12210,7 +12943,7 @@ set dummy msgmerge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then : +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGMERGE in @@ -12250,7 +12983,7 @@ set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGFMT in @@ -12290,7 +13023,7 @@ set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -12341,7 +13074,7 @@ set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : +if ${ac_cv_path_INTLTOOL_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in @@ -12425,7 +13158,7 @@ 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" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : DATADIRNAME=share else DATADIRNAME=lib @@ -12449,7 +13182,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -12490,7 +13223,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12629,7 +13362,7 @@ done -XFCONF_VERSION=4.8.0 +XFCONF_VERSION=4.8.1 LIBXFCONF_VERSION_API=0 LIBXFCONF_VERINFO=2:0:0 @@ -12645,12 +13378,12 @@ - ALL_LINGUAS="ar ast bn ca cs da de el en_GB es eu fi fr gl he hu id it ja kk lv nb nl pa pl pt_BR pt ro ru si sk sv tr ug uk ur_PK ur zh_CN zh_TW " + ALL_LINGUAS="ar ast bn ca cs da de el en_GB es eu fi fr gl he hr hu id is it ja kk ko lv ms nb nl pa pl pt_BR pt ro ru si sk sv te tr ug uk ur_PK ur zh_CN zh_TW " 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" = x""yes; then : +if test "x$ac_cv_header_locale_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LOCALE_H 1 _ACEOF @@ -12662,7 +13395,7 @@ if test $ac_cv_header_locale_h = yes; then { $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 confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12702,7 +13435,7 @@ INTLLIBS= 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" = x""yes; then : +if test "x$ac_cv_header_libintl_h" = xyes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" @@ -12711,7 +13444,7 @@ # { $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 confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12742,7 +13475,7 @@ if test "$gt_cv_func_ngettext_libc" = "yes" ; then { $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 confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12775,7 +13508,7 @@ 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" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -12794,7 +13527,7 @@ { $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 @@ -12828,10 +13561,10 @@ fi { $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 : +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 @@ -12865,10 +13598,10 @@ fi { $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 : +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 @@ -12902,7 +13635,7 @@ fi { $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 @@ -12918,7 +13651,7 @@ $as_echo "" >&6; } { $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 @@ -12952,10 +13685,10 @@ fi { $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 : +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 @@ -12989,7 +13722,7 @@ fi { $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 @@ -13014,7 +13747,7 @@ 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" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -13052,7 +13785,7 @@ set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -13089,7 +13822,7 @@ for ac_func in dcgettext do : ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = x""yes; then : +if test "x$ac_cv_func_dcgettext" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DCGETTEXT 1 _ACEOF @@ -13130,7 +13863,7 @@ set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -13171,7 +13904,7 @@ set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -13222,7 +13955,7 @@ 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" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -13231,6 +13964,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -13352,7 +14089,7 @@ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : fi @@ -13395,13 +14132,21 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -13424,7 +14169,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -13438,56 +14182,106 @@ fi - - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi - - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-2.0 >= 2.18.0" >&5 -$as_echo_n "checking for gobject-2.0 >= 2.18.0... " >&6; } - if $PKG_CONFIG "--atleast-version=2.18.0" "gobject-2.0" >/dev/null 2>&1; then - GLIB_VERSION=`$PKG_CONFIG --modversion "gobject-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_VERSION" >&5 -$as_echo "$GLIB_VERSION" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GLIB_CFLAGS" >&5 -$as_echo_n "checking GLIB_CFLAGS... " >&6; } - GLIB_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_CFLAGS" >&5 -$as_echo "$GLIB_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GLIB_LIBS" >&5 -$as_echo_n "checking GLIB_LIBS... " >&6; } +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-2.0 >= 2.18.0" >&5 +$as_echo_n "checking for gobject-2.0 >= 2.18.0... " >&6; } + if $PKG_CONFIG "--atleast-version=2.18.0" "gobject-2.0" >/dev/null 2>&1; then + GLIB_VERSION=`$PKG_CONFIG --modversion "gobject-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_VERSION" >&5 +$as_echo "$GLIB_VERSION" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GLIB_CFLAGS" >&5 +$as_echo_n "checking GLIB_CFLAGS... " >&6; } + GLIB_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_CFLAGS" >&5 +$as_echo "$GLIB_CFLAGS" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GLIB_LIBS" >&5 +$as_echo_n "checking GLIB_LIBS... " >&6; } GLIB_LIBS=`$PKG_CONFIG --libs "gobject-2.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_LIBS" >&5 $as_echo "$GLIB_LIBS" >&6; } @@ -13533,13 +14327,21 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -13562,7 +14364,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -13576,39 +14377,89 @@ fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.8.0" >&5 @@ -13671,13 +14522,21 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -13700,7 +14559,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -13714,39 +14572,89 @@ fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1 >= 1.0.0" >&5 @@ -13809,13 +14717,21 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -13838,7 +14754,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -13852,39 +14767,89 @@ fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.72" >&5 @@ -13949,7 +14914,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then : +if ${ac_cv_path_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -14061,7 +15026,7 @@ # see AC_CHECK_SIZEOF for more information. { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of guchar" >&5 $as_echo_n "checking alignment of guchar... " >&6; } -if test "${ac_cv_alignof_guchar+set}" = set; then : +if ${ac_cv_alignof_guchar+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guchar" "#include @@ -14105,7 +15070,7 @@ # see AC_CHECK_SIZEOF for more information. { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of gchar" >&5 $as_echo_n "checking alignment of gchar... " >&6; } -if test "${ac_cv_alignof_gchar+set}" = set; then : +if ${ac_cv_alignof_gchar+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gchar" "#include @@ -14149,7 +15114,7 @@ # see AC_CHECK_SIZEOF for more information. { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of guint16" >&5 $as_echo_n "checking alignment of guint16... " >&6; } -if test "${ac_cv_alignof_guint16+set}" = set; then : +if ${ac_cv_alignof_guint16+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guint16" "#include @@ -14193,7 +15158,7 @@ # see AC_CHECK_SIZEOF for more information. { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of gint16" >&5 $as_echo_n "checking alignment of gint16... " >&6; } -if test "${ac_cv_alignof_gint16+set}" = set; then : +if ${ac_cv_alignof_gint16+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gint16" "#include @@ -14237,7 +15202,7 @@ # see AC_CHECK_SIZEOF for more information. { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of guint32" >&5 $as_echo_n "checking alignment of guint32... " >&6; } -if test "${ac_cv_alignof_guint32+set}" = set; then : +if ${ac_cv_alignof_guint32+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guint32" "#include @@ -14281,7 +15246,7 @@ # see AC_CHECK_SIZEOF for more information. { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of gint32" >&5 $as_echo_n "checking alignment of gint32... " >&6; } -if test "${ac_cv_alignof_gint32+set}" = set; then : +if ${ac_cv_alignof_gint32+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gint32" "#include @@ -14325,7 +15290,7 @@ # see AC_CHECK_SIZEOF for more information. { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of guint64" >&5 $as_echo_n "checking alignment of guint64... " >&6; } -if test "${ac_cv_alignof_guint64+set}" = set; then : +if ${ac_cv_alignof_guint64+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guint64" "#include @@ -14369,7 +15334,7 @@ # see AC_CHECK_SIZEOF for more information. { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of gint64" >&5 $as_echo_n "checking alignment of gint64... " >&6; } -if test "${ac_cv_alignof_gint64+set}" = set; then : +if ${ac_cv_alignof_gint64+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gint64" "#include @@ -14413,7 +15378,7 @@ # see AC_CHECK_SIZEOF for more information. { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of gfloat" >&5 $as_echo_n "checking alignment of gfloat... " >&6; } -if test "${ac_cv_alignof_gfloat+set}" = set; then : +if ${ac_cv_alignof_gfloat+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gfloat" "#include @@ -14457,7 +15422,7 @@ # see AC_CHECK_SIZEOF for more information. { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of gdouble" >&5 $as_echo_n "checking alignment of gdouble... " >&6; } -if test "${ac_cv_alignof_gdouble+set}" = set; then : +if ${ac_cv_alignof_gdouble+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gdouble" "#include @@ -14501,7 +15466,7 @@ # see AC_CHECK_SIZEOF for more information. { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of gboolean" >&5 $as_echo_n "checking alignment of gboolean... " >&6; } -if test "${ac_cv_alignof_gboolean+set}" = set; then : +if ${ac_cv_alignof_gboolean+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gboolean" "#include @@ -14533,180 +15498,62 @@ _ACEOF - CFLAGS="$saved_CFLAGS" - LIBS="$saved_LIBS" - - - saved_CFLAGS="$CFLAGS" - saved_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - # The cast to long int works around a bug in the HP C Compiler, -# see AC_CHECK_SIZEOF for more information. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of gpointer" >&5 -$as_echo_n "checking alignment of gpointer... " >&6; } -if test "${ac_cv_alignof_gpointer+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gpointer" "#include - -#ifndef offsetof -# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0) -#endif -typedef struct { char x; gpointer y; } ac__type_alignof_;"; then : - -else - if test "$ac_cv_type_gpointer" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute alignment of gpointer -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_alignof_gpointer=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gpointer" >&5 -$as_echo "$ac_cv_alignof_gpointer" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define ALIGNOF_GPOINTER $ac_cv_alignof_gpointer -_ACEOF - - - CFLAGS="$saved_CFLAGS" - LIBS="$saved_LIBS" - - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + CFLAGS="$saved_CFLAGS" + LIBS="$saved_LIBS" + + + saved_CFLAGS="$CFLAGS" + saved_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + # The cast to long int works around a bug in the HP C Compiler, +# see AC_CHECK_SIZEOF for more information. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of gpointer" >&5 +$as_echo_n "checking alignment of gpointer... " >&6; } +if ${ac_cv_alignof_gpointer+:} false; then : + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gpointer" "#include + +#ifndef offsetof +# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0) +#endif +typedef struct { char x; gpointer y; } ac__type_alignof_;"; then : - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" + if test "$ac_cv_type_gpointer" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute alignment of gpointer +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_alignof_gpointer=0 + fi fi fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gpointer" >&5 +$as_echo "$ac_cv_alignof_gpointer" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define ALIGNOF_GPOINTER $ac_cv_alignof_gpointer +_ACEOF + + + CFLAGS="$saved_CFLAGS" + LIBS="$saved_LIBS" + + + # 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 test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : +if ${ac_cv_path_GTKDOC_CHECK+:} false; then : $as_echo_n "(cached) " >&6 else case $GTKDOC_CHECK in @@ -14748,7 +15595,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then : +if ${ac_cv_path_GTKDOC_REBASE+:} false; then : $as_echo_n "(cached) " >&6 else case $GTKDOC_REBASE in @@ -14792,7 +15639,7 @@ 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 test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then : +if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : $as_echo_n "(cached) " >&6 else case $GTKDOC_MKPDF in @@ -14859,6 +15706,99 @@ else as_fn_error $? "You need to have gtk-doc >= 1.0 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 @@ -14965,19 +15905,26 @@ -Wno-missing-field-initializers \ -Wno-unused-parameter -Wold-style-definition \ -Wdeclaration-after-statement \ - -Wmissing-declarations -Wredundant-decls \ + -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ -Wcast-align -Wformat-security \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs \ - -fstack-protector" + -Wmissing-format-attribute -Wnested-externs" CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + if test x`uname` = x"Linux"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" + fi + + if test x`uname` != x"OpenBSD"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls" + fi + if test x"$enable_debug" = x"full"; then $as_echo "#define DEBUG_TRACE 1" >>confdefs.h - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g3 -Werror" + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror" CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" { $as_echo "$as_me:${as_lineno-$LINENO}: result: full" >&5 $as_echo "full" >&6; } @@ -15143,6 +16090,33 @@ if test "x$have_gnuc_visibility" = "xyes"; then CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY" + xdt_vis_hidden_cflags="" + + for flag in -xldscope=hidden; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5 +$as_echo_n "checking if $CC supports $flag... " >&6; } + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + flag_supported=yes +else + flag_supported=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$saved_CFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_supported" >&5 +$as_echo "$flag_supported" >&6; } + + if test "x$flag_supported" = "xyes"; then + xdt_vis_hidden_cflags="$xdt_vis_hidden_cflags $flag" + fi + done + + if test "x$xdt_vis_hidden_cflags" = "x"; then for flag in -fvisibility=hidden; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5 @@ -15168,6 +16142,7 @@ fi done + fi CFLAGS="$CFLAGS $xdt_vis_hidden_cflags" fi @@ -15191,19 +16166,21 @@ if test "x$enable_linker_opts" != "xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --as-needed" >&5 + if test x`uname` != x"OpenBSD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --as-needed" >&5 $as_echo_n "checking whether $LD accepts --as-needed... " >&6; } - case `$LD --as-needed -v 2>&1 &5 + case `$LD --as-needed -v 2>&1 &5 $as_echo "yes" >&6; } - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - ;; - esac + ;; + esac + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts -O1" >&5 $as_echo_n "checking whether $LD accepts -O1... " >&6; } case `$LD -O1 -v 2>&1 >confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -15405,7 +16393,7 @@ 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" @@ -15506,6 +16494,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -15812,8 +16801,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfconf $as_me 4.8.0, which was -generated by GNU Autoconf 2.66. Invocation command line was +This file was extended by xfconf $as_me 4.8.1, which was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15878,8 +16867,8 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xfconf config.status 4.8.0 -configured by $0, generated by GNU Autoconf 2.66, +xfconf config.status 4.8.1 +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" Copyright (C) 2010 Free Software Foundation, Inc. @@ -15900,11 +16889,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 @@ -15926,6 +16920,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -16009,6 +17004,7 @@ 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"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $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"`' @@ -16029,13 +17025,20 @@ 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"`' @@ -16050,14 +17053,17 @@ 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_wl='`$ECHO "$lt_prog_compiler_wl" | $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"`' @@ -16081,7 +17087,6 @@ 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"`' @@ -16090,12 +17095,12 @@ 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"`' -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $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"`' @@ -16137,6 +17142,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -16150,8 +17156,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 \ @@ -16161,12 +17172,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 \ +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 \ @@ -16180,9 +17193,7 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -16218,6 +17229,7 @@ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ @@ -16313,9 +17325,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -16323,12 +17336,13 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -16350,7 +17364,7 @@ ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -16378,7 +17392,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 @@ -16426,7 +17440,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 = "" @@ -16458,7 +17472,7 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -16492,7 +17506,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 @@ -16504,8 +17518,8 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 @@ -16625,7 +17639,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 `:'. @@ -16660,7 +17674,7 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ + *:-:* | *:-) cat >"$ac_tmp/stdin" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; @@ -16797,21 +17811,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $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;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -16822,20 +17837,20 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ + && 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" "$tmp/config.h" >/dev/null 2>&1; then + 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" \ + 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" \ + && 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. @@ -16997,8 +18012,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, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -17052,6 +18067,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -17101,19 +18119,42 @@ # turn newlines into spaces. NL2SP=$lt_lt_NL2SP +# 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 # 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 @@ -17143,6 +18184,12 @@ # 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 +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec + +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -17152,6 +18199,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 @@ -17266,12 +18316,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 @@ -17321,10 +18371,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -17358,9 +18404,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 @@ -17376,6 +18419,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 @@ -17408,210 +18454,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 "${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_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$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 "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; 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 "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED '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" diff -Nru xfconf-4.8.0/configure.ac xfconf-4.8.1/configure.ac --- xfconf-4.8.0/configure.ac 2011-01-16 14:51:51.000000000 +0000 +++ xfconf-4.8.1/configure.ac 2011-12-23 16:05:11.000000000 +0000 @@ -15,9 +15,9 @@ m4_define([libxfconf_version_api], [0]) m4_define([xfconf_version_major], [4]) m4_define([xfconf_version_minor], [8]) -m4_define([xfconf_version_micro], [0]) +m4_define([xfconf_version_micro], [1]) m4_define([xfconf_version_nano], []) -m4_define([xfconf_version_build], [75c5ad2]) +m4_define([xfconf_version_build], [8aed663]) m4_define([xfconf_version_tag], []) m4_define([xfconf_version], [xfconf_version_major().xfconf_version_minor().xfconf_version_micro()ifelse(xfconf_version_nano(), [], [], [.xfconf_version_nano()])ifelse(xfconf_version_tag(), [git], [xfconf_version_tag()-xfconf_version_build()], [xfconf_version_tag()])]) @@ -33,6 +33,14 @@ AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl set helper path prefix +AC_ARG_WITH([helper-path-prefix], + [AC_HELP_STRING([--with-helper-path-prefix=PATH], + [Path prefix under which helper executables will be installed (default: $libdir)])], + [HELPER_PATH_PREFIX="$withval"], + [HELPER_PATH_PREFIX="$libdir"]) +AC_SUBST([HELPER_PATH_PREFIX]) + dnl check for UNIX variants AC_AIX AC_ISC_POSIX @@ -65,7 +73,7 @@ AC_SUBST(LIBXFCONF_VERINFO) dnl Check for i18n support -XDT_I18N([ar ast bn ca cs da de el en_GB es eu fi fr gl he hu id it ja kk lv nb nl pa pl pt_BR pt ro ru si sk sv tr ug uk ur_PK ur zh_CN zh_TW ]) +XDT_I18N([ar ast bn ca cs da de el en_GB es eu fi fr gl he hr hu id is it ja kk ko lv ms nb nl pa pl pt_BR pt ro ru si sk sv te tr ug uk ur_PK ur zh_CN zh_TW ]) dnl Check for X11 installed dnl XDT_CHECK_LIBX11_REQUIRE diff -Nru xfconf-4.8.0/debian/changelog xfconf-4.8.1/debian/changelog --- xfconf-4.8.0/debian/changelog 2011-04-19 13:53:32.000000000 +0000 +++ xfconf-4.8.1/debian/changelog 2011-12-28 20:18:18.000000000 +0000 @@ -1,3 +1,16 @@ +xfconf (4.8.1-1) unstable; urgency=low + + [ Lionel Le Folgoc ] + * New upstream bugfix release, including: + - fix double free lp: #802280 + - update Dutch translation. lp: #781060 + + [ Yves-Alexis Perez ] + * debian/rules: + - drop useless --enable-final argument to configure. + + -- Lionel Le Folgoc Wed, 28 Dec 2011 21:18:17 +0100 + xfconf (4.8.0-3) unstable; urgency=low * Upload to unstable. diff -Nru xfconf-4.8.0/debian/rules xfconf-4.8.1/debian/rules --- xfconf-4.8.0/debian/rules 2011-03-30 15:24:59.000000000 +0000 +++ xfconf-4.8.1/debian/rules 2011-12-28 20:17:53.000000000 +0000 @@ -13,7 +13,7 @@ dh $@ override_dh_auto_configure: - dh_auto_configure -- --enable-final --disable-perl-bindings + dh_auto_configure -- --disable-perl-bindings override_dh_auto_test: diff -Nru xfconf-4.8.0/docs/Makefile.in xfconf-4.8.1/docs/Makefile.in --- xfconf-4.8.0/docs/Makefile.in 2011-01-16 14:51:55.000000000 +0000 +++ xfconf-4.8.1/docs/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -120,6 +120,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -137,9 +138,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -168,6 +172,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -213,6 +218,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@ diff -Nru xfconf-4.8.0/docs/reference/html/ch01.html xfconf-4.8.1/docs/reference/html/ch01.html --- xfconf-4.8.0/docs/reference/html/ch01.html 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/ch01.html 2011-12-23 16:05:30.000000000 +0000 @@ -3,12 +3,12 @@ Xfconf Core Functionality - + - + @@ -19,9 +19,9 @@ Xfconf Reference Manual Next -
+

-Xfconf Core Functionality

+Xfconf Core Functionality
Xfconf Types — GObject types used by the Xfconf daemon and library @@ -33,6 +33,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru xfconf-4.8.0/docs/reference/html/ch02.html xfconf-4.8.1/docs/reference/html/ch02.html --- xfconf-4.8.0/docs/reference/html/ch02.html 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/ch02.html 2011-12-23 16:05:30.000000000 +0000 @@ -3,12 +3,12 @@ Xfconf Daemon - + - + @@ -19,15 +19,15 @@ Xfconf Reference Manual Next -
+

-Xfconf Daemon

+Xfconf Daemon
XfconfBackend — Interface for configuration store backends
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru xfconf-4.8.0/docs/reference/html/ch03.html xfconf-4.8.1/docs/reference/html/ch03.html --- xfconf-4.8.0/docs/reference/html/ch03.html 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/ch03.html 2011-12-23 16:05:30.000000000 +0000 @@ -3,12 +3,12 @@ Xfconf Client Library - + - + @@ -19,9 +19,9 @@ Xfconf Reference Manual Next -
+

-Xfconf Client Library

+Xfconf Client Library
Xfconf Library Core — Init routines and core functionality for libxfconf @@ -36,6 +36,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru xfconf-4.8.0/docs/reference/html/index.html xfconf-4.8.1/docs/reference/html/index.html --- xfconf-4.8.0/docs/reference/html/index.html 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/index.html 2011-12-23 16:05:30.000000000 +0000 @@ -3,14 +3,14 @@ Xfconf Reference Manual - + - + -
+
@@ -45,6 +45,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru xfconf-4.8.0/docs/reference/html/style.css xfconf-4.8.1/docs/reference/html/style.css --- xfconf-4.8.0/docs/reference/html/style.css 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/style.css 2011-12-23 16:05:30.000000000 +0000 @@ -32,8 +32,9 @@ /* 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; - padding-top:4.5em; + top:-5em; } /* this seems to be a bug in the xsl style sheets when generating indexes */ div.index div.index diff -Nru xfconf-4.8.0/docs/reference/html/xfconf.devhelp xfconf-4.8.1/docs/reference/html/xfconf.devhelp --- xfconf-4.8.0/docs/reference/html/xfconf.devhelp 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/xfconf.devhelp 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru xfconf-4.8.0/docs/reference/html/xfconf.devhelp2 xfconf-4.8.1/docs/reference/html/xfconf.devhelp2 --- xfconf-4.8.0/docs/reference/html/xfconf.devhelp2 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/xfconf.devhelp2 2011-12-23 16:05:30.000000000 +0000 @@ -22,7 +22,7 @@ - + diff -Nru xfconf-4.8.0/docs/reference/html/xfconf-xfconf-backend.html xfconf-4.8.1/docs/reference/html/xfconf-xfconf-backend.html --- xfconf-4.8.0/docs/reference/html/xfconf-xfconf-backend.html 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/xfconf-xfconf-backend.html 2011-12-23 16:05:30.000000000 +0000 @@ -3,12 +3,12 @@ XfconfBackend - + - + @@ -30,7 +30,7 @@ Prerequisites -
+
@@ -39,59 +39,59 @@
-
+

Synopsis

-
                    XfconfBackendInterface;
+
struct              XfconfBackendInterface;
                     XfconfBackend;
-gboolean            xfconf_backend_initialize           (XfconfBackend *backend,
-                                                         GError **error);
-gboolean            xfconf_backend_set                  (XfconfBackend *backend,
-                                                         const gchar *channel,
-                                                         const gchar *property,
-                                                         const GValue *value,
-                                                         GError **error);
-gboolean            xfconf_backend_get                  (XfconfBackend *backend,
-                                                         const gchar *channel,
-                                                         const gchar *property,
-                                                         GValue *value,
-                                                         GError **error);
-gboolean            xfconf_backend_get_all              (XfconfBackend *backend,
-                                                         const gchar *channel,
-                                                         const gchar *property_base,
-                                                         GHashTable *properties,
-                                                         GError **error);
-gboolean            xfconf_backend_exists               (XfconfBackend *backend,
-                                                         const gchar *channel,
-                                                         const gchar *property,
-                                                         gboolean *exists,
-                                                         GError **error);
-gboolean            xfconf_backend_reset                (XfconfBackend *backend,
-                                                         const gchar *channel,
-                                                         const gchar *property,
-                                                         gboolean recursive,
-                                                         GError **error);
-gboolean            xfconf_backend_flush                (XfconfBackend *backend,
-                                                         GError **error);
+gboolean            xfconf_backend_initialize           (XfconfBackend *backend,
+                                                         GError **error);
+gboolean            xfconf_backend_set                  (XfconfBackend *backend,
+                                                         const gchar *channel,
+                                                         const gchar *property,
+                                                         const GValue *value,
+                                                         GError **error);
+gboolean            xfconf_backend_get                  (XfconfBackend *backend,
+                                                         const gchar *channel,
+                                                         const gchar *property,
+                                                         GValue *value,
+                                                         GError **error);
+gboolean            xfconf_backend_get_all              (XfconfBackend *backend,
+                                                         const gchar *channel,
+                                                         const gchar *property_base,
+                                                         GHashTable *properties,
+                                                         GError **error);
+gboolean            xfconf_backend_exists               (XfconfBackend *backend,
+                                                         const gchar *channel,
+                                                         const gchar *property,
+                                                         gboolean *exists,
+                                                         GError **error);
+gboolean            xfconf_backend_reset                (XfconfBackend *backend,
+                                                         const gchar *channel,
+                                                         const gchar *property,
+                                                         gboolean recursive,
+                                                         GError **error);
+gboolean            xfconf_backend_flush                (XfconfBackend *backend,
+                                                         GError **error);
 void                xfconf_backend_register_property_changed_func
                                                         (XfconfBackend *backend,
                                                          XfconfPropertyChangedFunc func,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
-
+

Object Hierarchy

   GInterface
    +----XfconfBackend
-
+

Prerequisites

XfconfBackend requires - GObject.

+ GObject.

-
+

Description

XfconfBackend is an abstract interface that allows the Xfconf Daemon @@ -100,11 +100,11 @@ one could think of to store data.

-
+

Details

-
-

XfconfBackendInterface

-
typedef struct {
+

+
struct XfconfBackendInterface

+
struct XfconfBackendInterface {
     GTypeInterface parent;
     
     gboolean (*initialize)(XfconfBackend *backend,
@@ -162,7 +162,7 @@
     void (*_xb_reserved1)();
     void (*_xb_reserved2)();
     void (*_xb_reserved3)();
-} XfconfBackendInterface;
+};
 

 

 An interface for implementing pluggable configuration store backends
@@ -170,102 +170,87 @@
 

 

 See the XfconfBackend function documentation for a description of what
-each virtual function in XfconfBackendInterface should do.
+each virtual function in XfconfBackendInterface should do.
 

 

-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+

 
 
 
GTypeInterface parent;
GObject interface parent.
-
GTypeInterface parent;
GObject interface parent.
 

 

 
initialize ()
See xfconf_backend_initialize().
-See xfconf_backend_initialize().
 

 

 
set ()
See xfconf_backend_set().
-See xfconf_backend_set().
 

 

 
get ()
See xfconf_backend_get().
-See xfconf_backend_get().
 

 

 
get_all ()
See xfconf_backend_get_all().
-See xfconf_backend_get_all().
 

 

 
exists ()
See xfconf_backend_exists().
-See xfconf_backend_exists().
 

 

 
reset ()
See xfconf_backend_reset().
-See xfconf_backend_reset().
 

 

 
list_channels ()
See xfconf_backend_list_channels().
-See xfconf_backend_list_channels().
 

 

 
is_property_locked ()
See xfconf_backend_is_property_locked().
-See xfconf_backend_is_property_locked().
 

 

 
flush ()
See xfconf_backend_flush().
-See xfconf_backend_flush().
 

 

 
register_property_changed_func ()
See xfconf_backend_register_property_changed_func().
-See xfconf_backend_register_property_changed_func().
 

 

 
_xb_reserved0 ()
Reserved for future expansion.
-Reserved for future expansion.
 

 

 
_xb_reserved1 ()
Reserved for future expansion.
-Reserved for future expansion.
 

 

 
_xb_reserved2 ()
Reserved for future expansion.
-Reserved for future expansion.
 

 

 
_xb_reserved3 ()
Reserved for future expansion.
-Reserved for future expansion.
 

 
 

 

 

-

+

 
XfconfBackend

 
typedef struct _XfconfBackend XfconfBackend;

 

-An instance of a class implementing a XfconfBackendInterface.
+An instance of a class implementing a XfconfBackendInterface.
 

 

 

-

+

 
xfconf_backend_initialize ()

-
gboolean            xfconf_backend_initialize           (XfconfBackend *backend,
-                                                         GError **error);

+
gboolean            xfconf_backend_initialize           (XfconfBackend *backend,
+                                                         GError **error);

 

 Does any pre-initialization that the backend needs to function.
 

@@ -274,32 +259,29 @@
 
 
 
backend :

-The XfconfBackend.
-
+The XfconfBackend.
 
 
 
error :

-An error return.
-
+An error return.
 
 
 
Returns :

- The backend should return TRUE if initialization
-              was successful, or FALSE otherwise.  On FALSE,
-              error should be set to a description of the failure.
-
+The backend should return TRUE if initialization
+was successful, or FALSE otherwise.  On FALSE,
+error should be set to a description of the failure.
 
 
 

 

 

-

+

 
xfconf_backend_set ()

-
gboolean            xfconf_backend_set                  (XfconfBackend *backend,
-                                                         const gchar *channel,
-                                                         const gchar *property,
-                                                         const GValue *value,
-                                                         GError **error);

+
gboolean            xfconf_backend_set                  (XfconfBackend *backend,
+                                                         const gchar *channel,
+                                                         const gchar *property,
+                                                         const GValue *value,
+                                                         GError **error);

 

 Sets the variant value for property on channel.
 

@@ -308,47 +290,41 @@
 
 
 
backend :

-The XfconfBackend.
-
+The XfconfBackend.
 
 
 
channel :

-A channel name.
-
+A channel name.
 
 
 
property :

-A property name.
-
+A property name.
 
 
 
value :

-A value.
-
+A value.
 
 
 
error :

-An error return.
-
+An error return.
 
 
 
Returns :

- The backend should return TRUE if the operation
-              was successful, or FALSE otherwise.  On FALSE,
-              error should be set to a description of the failure.
-
+The backend should return TRUE if the operation
+was successful, or FALSE otherwise.  On FALSE,
+error should be set to a description of the failure.
 
 
 

 

 

-

+

 
xfconf_backend_get ()

-
gboolean            xfconf_backend_get                  (XfconfBackend *backend,
-                                                         const gchar *channel,
-                                                         const gchar *property,
-                                                         GValue *value,
-                                                         GError **error);

+
gboolean            xfconf_backend_get                  (XfconfBackend *backend,
+                                                         const gchar *channel,
+                                                         const gchar *property,
+                                                         GValue *value,
+                                                         GError **error);

 

 Gets the value of property on channel and stores it in value.
 

@@ -357,51 +333,45 @@
 
 
 
backend :

-The XfconfBackend.
-
+The XfconfBackend.
 
 
 
channel :

-A channel name.
-
+A channel name.
 
 
 
property :

-A property name.
-
+A property name.
 
 
 
value :

-A GValue return.
-
+A GValue return.
 
 
 
error :

-An error return.
-
+An error return.
 
 
 
Returns :

- The backend should return TRUE if the operation
-              was successful, or FALSE otherwise.  On FALSE,
-              error should be set to a description of the failure.
-
+The backend should return TRUE if the operation
+was successful, or FALSE otherwise.  On FALSE,
+error should be set to a description of the failure.
 
 
 

 

 

-

+

 
xfconf_backend_get_all ()

-
gboolean            xfconf_backend_get_all              (XfconfBackend *backend,
-                                                         const gchar *channel,
-                                                         const gchar *property_base,
-                                                         GHashTable *properties,
-                                                         GError **error);

+
gboolean            xfconf_backend_get_all              (XfconfBackend *backend,
+                                                         const gchar *channel,
+                                                         const gchar *property_base,
+                                                         GHashTable *properties,
+                                                         GError **error);

 

 Gets multiple properties and values on channel and stores them in
-properties, which is already initialized to hold gchar* keys and
-GValue* values.  The property_base parameter can be
+properties, which is already initialized to hold gchar* keys and
+GValue* values.  The property_base parameter can be
 used to limit the retrieval to a sub-tree of the property tree.
 

 

@@ -413,100 +383,88 @@
 
 
 
backend :

-The XfconfBackend.
-
+The XfconfBackend.
 
 
 
channel :

-A channel name.
-
+A channel name.
 
 
 
property_base :

-The base of properties to return.
-
+The base of properties to return.
 
 
 
properties :

-A GHashTable.
-
+A GHashTable.
 
 
 
error :

-An error return.
-
+An error return.
 
 
 
Returns :

- The backend should return TRUE if the operation
-              was successful, or FALSE otherwise.  On FALSE,
-              error should be set to a description of the failure.
-
+The backend should return TRUE if the operation
+was successful, or FALSE otherwise.  On FALSE,
+error should be set to a description of the failure.
 
 
 

 

 

-

+

 
xfconf_backend_exists ()

-
gboolean            xfconf_backend_exists               (XfconfBackend *backend,
-                                                         const gchar *channel,
-                                                         const gchar *property,
-                                                         gboolean *exists,
-                                                         GError **error);

+
gboolean            xfconf_backend_exists               (XfconfBackend *backend,
+                                                         const gchar *channel,
+                                                         const gchar *property,
+                                                         gboolean *exists,
+                                                         GError **error);

 

-Checks to see if property exists on channel, and stores TRUE or
-FALSE in exists.
+Checks to see if property exists on channel, and stores TRUE or
+FALSE in exists.
 

 

-
+
-
+
-
+
-
+
-
+
-
+

 
 
 

 
backend :
The XfconfBackend.
-The XfconfBackend.
 

 

 
channel :
A channel name.
-A channel name.
 

 

 
property :
A property name.
-A property name.
 

 

 
exists :
A boolean return.
-A boolean return.
 

 

 
error :
An error return.
-An error return.
 

 

 
Returns :
 The backend should return TRUE if the operation
-              was successful, or FALSE otherwise.  On FALSE,
-              error should be set to a description of the failure.
-The backend should return TRUE if the operation
+was successful, or FALSE otherwise.  On FALSE,
+error should be set to a description of the failure.
 

 
 

 

 

-

+

 
xfconf_backend_reset ()

-
gboolean            xfconf_backend_reset                (XfconfBackend *backend,
-                                                         const gchar *channel,
-                                                         const gchar *property,
-                                                         gboolean recursive,
-                                                         GError **error);

+
gboolean            xfconf_backend_reset                (XfconfBackend *backend,
+                                                         const gchar *channel,
+                                                         const gchar *property,
+                                                         gboolean recursive,
+                                                         GError **error);

 

 Resets the property identified by property from channel.
-If recursive is TRUE, all sub-properties of property will be
+If recursive is TRUE, all sub-properties of property will be
 reset as well.  If the empty string ("") or a forward slash ("/")
 is specified for property, the entire channel will be reset.
 

@@ -520,44 +478,38 @@
 
 
 
backend :

-The XfconfBackend.
-
+The XfconfBackend.
 
 
 
channel :

-A channel name.
-
+A channel name.
 
 
 
property :

-A property name.
-
+A property name.
 
 
 
recursive :

-Whether or not the reset is recursive.
-
+Whether or not the reset is recursive.
 
 
 
error :

-An error return.
-
+An error return.
 
 
 
Returns :

- The backend should return TRUE if the operation
-              was successful, or FALSE otherwise.  On FALSE,
-              error should be set to a description of the failure.
-
+The backend should return TRUE if the operation
+was successful, or FALSE otherwise.  On FALSE,
+error should be set to a description of the failure.
 
 
 

 

 

-

+

 
xfconf_backend_flush ()

-
gboolean            xfconf_backend_flush                (XfconfBackend *backend,
-                                                         GError **error);

+
gboolean            xfconf_backend_flush                (XfconfBackend *backend,
+                                                         GError **error);

 

 For backends that support persistent storage, ensures that all
 configuration data stored in memory is saved to persistent storage.
@@ -567,31 +519,28 @@
 
 
 
backend :

-The XfconfBackend.
-
+The XfconfBackend.
 
 
 
error :

-An error return.
-
+An error return.
 
 
 
Returns :

- The backend should return TRUE if the operation
-              was successful, or FALSE otherwise.  On FALSE,
-              error should be set to a description of the failure.
-
+The backend should return TRUE if the operation
+was successful, or FALSE otherwise.  On FALSE,
+error should be set to a description of the failure.
 
 
 

 

 

-

+

 
xfconf_backend_register_property_changed_func ()

 
void                xfconf_backend_register_property_changed_func
                                                         (XfconfBackend *backend,
                                                          XfconfPropertyChangedFunc func,
-                                                         gpointer user_data);

+                                                         gpointer user_data);

Registers a function to be called when a property changes. The backend implementation should keep a pointer to func and user_data @@ -602,18 +551,15 @@

backend :

-The XfconfBackend. - +The XfconfBackend.

func :

-A function of type XfconfPropertyChangeFunc. - +A function of type XfconfPropertyChangeFunc.

user_data :

-Arbitrary caller-supplied data. - +Arbitrary caller-supplied data.
@@ -622,6 +568,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru xfconf-4.8.0/docs/reference/html/xfconf-xfconf-binding.html xfconf-4.8.1/docs/reference/html/xfconf-xfconf-binding.html --- xfconf-4.8.0/docs/reference/html/xfconf-xfconf-binding.html 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/xfconf-xfconf-binding.html 2011-12-23 16:05:30.000000000 +0000 @@ -3,11 +3,11 @@ Xfconf-GObject Binding - + - + @@ -25,7 +25,7 @@ Description -
+
@@ -34,27 +34,27 @@
-
+

Synopsis

-
gulong              xfconf_g_property_bind              (XfconfChannel *channel,
-                                                         const gchar *xfconf_property,
-                                                         GType xfconf_property_type,
-                                                         gpointer object,
-                                                         const gchar *object_property);
-gulong              xfconf_g_property_bind_gdkcolor     (XfconfChannel *channel,
-                                                         const gchar *xfconf_property,
-                                                         gpointer object,
-                                                         const gchar *object_property);
-void                xfconf_g_property_unbind            (gulong id);
+
gulong              xfconf_g_property_bind              (XfconfChannel *channel,
+                                                         const gchar *xfconf_property,
+                                                         GType xfconf_property_type,
+                                                         gpointer object,
+                                                         const gchar *object_property);
+gulong              xfconf_g_property_bind_gdkcolor     (XfconfChannel *channel,
+                                                         const gchar *xfconf_property,
+                                                         gpointer object,
+                                                         const gchar *object_property);
+void                xfconf_g_property_unbind            (gulong id);
 void                xfconf_g_property_unbind_by_property
                                                         (XfconfChannel *channel,
-                                                         const gchar *xfconf_property,
-                                                         gpointer object,
-                                                         const gchar *object_property);
-void                xfconf_g_property_unbind_all        (gpointer channel_or_object);
+                                                         const gchar *xfconf_property,
+                                                         gpointer object,
+                                                         const gchar *object_property);
+void                xfconf_g_property_unbind_all        (gpointer channel_or_object);
-
+

Description

Often it may be useful to bind an Xfconf property to a GObject property. @@ -67,18 +67,18 @@ all this.

-
+

Details

-
+

xfconf_g_property_bind ()

-
gulong              xfconf_g_property_bind              (XfconfChannel *channel,
-                                                         const gchar *xfconf_property,
-                                                         GType xfconf_property_type,
-                                                         gpointer object,
-                                                         const gchar *object_property);
+
gulong              xfconf_g_property_bind              (XfconfChannel *channel,
+                                                         const gchar *xfconf_property,
+                                                         GType xfconf_property_type,
+                                                         gpointer object,
+                                                         const gchar *object_property);

-Binds an Xfconf property to a GObject property. If the property -is changed via either the GObject or Xfconf, the corresponding +Binds an Xfconf property to a GObject property. If the property +is changed via either the GObject or Xfconf, the corresponding property will also be updated.

@@ -92,49 +92,43 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

xfconf_property :

-A property on channel. - +A property on channel.

xfconf_property_type :

-The type of xfconf_property. - +The type of xfconf_property.

object :

-A GObject. - +A GObject.

object_property :

-A valid property on object. - +A valid property on object.

Returns :

- an ID number that can be used to later remove the - binding. - +an ID number that can be used to later remove the +binding.
-
+

xfconf_g_property_bind_gdkcolor ()

-
gulong              xfconf_g_property_bind_gdkcolor     (XfconfChannel *channel,
-                                                         const gchar *xfconf_property,
-                                                         gpointer object,
-                                                         const gchar *object_property);
-

-Binds an Xfconf property to a GObject property of type -GDK_TYPE_COLOR (aka a GdkColor struct). If the property -is changed via either the GObject or Xfconf, the corresponding +

gulong              xfconf_g_property_bind_gdkcolor     (XfconfChannel *channel,
+                                                         const gchar *xfconf_property,
+                                                         gpointer object,
+                                                         const gchar *object_property);
+

+Binds an Xfconf property to a GObject property of type +GDK_TYPE_COLOR (aka a GdkColor struct). If the property +is changed via either the GObject or Xfconf, the corresponding property will also be updated.

@@ -149,37 +143,32 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

xfconf_property :

-A property on channel. - +A property on channel.

object :

-A GObject. - +A GObject.

object_property :

-A valid property on object. - +A valid property on object.

Returns :

- an ID number that can be used to later remove the - binding. - +an ID number that can be used to later remove the +binding.
-
+

xfconf_g_property_unbind ()

-
void                xfconf_g_property_unbind            (gulong id);
+
void                xfconf_g_property_unbind            (gulong id);

Removes an Xfconf/GObject property binding based on the binding ID number. See xfconf_g_property_bind(). @@ -188,21 +177,20 @@

id :

-A binding ID number. - +A binding ID number.
-
+

xfconf_g_property_unbind_by_property ()

void                xfconf_g_property_unbind_by_property
                                                         (XfconfChannel *channel,
-                                                         const gchar *xfconf_property,
-                                                         gpointer object,
-                                                         const gchar *object_property);
+ const gchar *xfconf_property, + gpointer object, + const gchar *object_property);

-Causes an Xfconf channel previously bound to a GObject property +Causes an Xfconf channel previously bound to a GObject property (see xfconf_g_property_bind()) to no longer be bound.

@@ -210,35 +198,31 @@ - + - + - + - +

channel :

An XfconfChannel. -An XfconfChannel.

xfconf_property :

A bound property on channel. -A bound property on channel.

object :

A GObject. -A GObject.

object_property :

A bound property on object. -A bound property on object.
-
+

xfconf_g_property_unbind_all ()

-
void                xfconf_g_property_unbind_all        (gpointer channel_or_object);
+
void                xfconf_g_property_unbind_all        (gpointer channel_or_object);

Unbinds all Xfconf channel bindings (see xfconf_g_property_bind()) to object. If object is an XfconfChannel, it will unbind all -xfconf properties on that channel. If object is a regular GObject +xfconf properties on that channel. If object is a regular GObject with properties bound to a channel, all those bindings will be removed.

@@ -246,8 +230,7 @@

channel_or_object :

-A GObject or XfconfChannel. - +A GObject or XfconfChannel.
@@ -255,6 +238,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru xfconf-4.8.0/docs/reference/html/xfconf-xfconf-channel.html xfconf-4.8.1/docs/reference/html/xfconf-xfconf-channel.html --- xfconf-4.8.0/docs/reference/html/xfconf-xfconf-channel.html 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/xfconf-xfconf-channel.html 2011-12-23 16:05:30.000000000 +0000 @@ -3,12 +3,12 @@ XfconfChannel - + - + @@ -32,7 +32,7 @@ Signals -
+
@@ -41,153 +41,153 @@
-
+

Synopsis

                    XfconfChannel;
-XfconfChannel *     xfconf_channel_get                  (const gchar *channel_name);
-XfconfChannel *     xfconf_channel_new                  (const gchar *channel_name);
+XfconfChannel *     xfconf_channel_get                  (const gchar *channel_name);
+XfconfChannel *     xfconf_channel_new                  (const gchar *channel_name);
 XfconfChannel *     xfconf_channel_new_with_property_base
-                                                        (const gchar *channel_name,
-                                                         const gchar *property_base);
-gboolean            xfconf_channel_has_property         (XfconfChannel *channel,
-                                                         const gchar *property);
-gboolean            xfconf_channel_is_property_locked   (XfconfChannel *channel,
-                                                         const gchar *property);
+                                                        (const gchar *channel_name,
+                                                         const gchar *property_base);
+gboolean            xfconf_channel_has_property         (XfconfChannel *channel,
+                                                         const gchar *property);
+gboolean            xfconf_channel_is_property_locked   (XfconfChannel *channel,
+                                                         const gchar *property);
 void                xfconf_channel_reset_property       (XfconfChannel *channel,
-                                                         const gchar *property_base,
-                                                         gboolean recursive);
-GHashTable *        xfconf_channel_get_properties       (XfconfChannel *channel,
-                                                         const gchar *property_base);
-gchar *             xfconf_channel_get_string           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gchar *default_value);
-gchar **            xfconf_channel_get_string_list      (XfconfChannel *channel,
-                                                         const gchar *property);
-gint32              xfconf_channel_get_int              (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gint32 default_value);
-guint32             xfconf_channel_get_uint             (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         guint32 default_value);
-guint64             xfconf_channel_get_uint64           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         guint64 default_value);
-gdouble             xfconf_channel_get_double           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gdouble default_value);
-gboolean            xfconf_channel_get_bool             (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gboolean default_value);
-gboolean            xfconf_channel_set_string           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gchar *value);
-gboolean            xfconf_channel_set_string_list      (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gchar * const *values);
-gboolean            xfconf_channel_set_int              (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gint32 value);
-gboolean            xfconf_channel_set_uint             (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         guint32 value);
-gboolean            xfconf_channel_set_uint64           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         guint64 value);
-gboolean            xfconf_channel_set_double           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gdouble value);
-gboolean            xfconf_channel_set_bool             (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gboolean value);
-gboolean            xfconf_channel_get_property         (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GValue *value);
-gboolean            xfconf_channel_set_property         (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const GValue *value);
-gboolean            xfconf_channel_get_array            (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GType first_value_type,
+                                                         const gchar *property_base,
+                                                         gboolean recursive);
+GHashTable *        xfconf_channel_get_properties       (XfconfChannel *channel,
+                                                         const gchar *property_base);
+gchar *             xfconf_channel_get_string           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gchar *default_value);
+gchar **            xfconf_channel_get_string_list      (XfconfChannel *channel,
+                                                         const gchar *property);
+gint32              xfconf_channel_get_int              (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gint32 default_value);
+guint32             xfconf_channel_get_uint             (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         guint32 default_value);
+guint64             xfconf_channel_get_uint64           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         guint64 default_value);
+gdouble             xfconf_channel_get_double           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gdouble default_value);
+gboolean            xfconf_channel_get_bool             (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gboolean default_value);
+gboolean            xfconf_channel_set_string           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gchar *value);
+gboolean            xfconf_channel_set_string_list      (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gchar * const *values);
+gboolean            xfconf_channel_set_int              (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gint32 value);
+gboolean            xfconf_channel_set_uint             (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         guint32 value);
+gboolean            xfconf_channel_set_uint64           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         guint64 value);
+gboolean            xfconf_channel_set_double           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gdouble value);
+gboolean            xfconf_channel_set_bool             (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gboolean value);
+gboolean            xfconf_channel_get_property         (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GValue *value);
+gboolean            xfconf_channel_set_property         (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const GValue *value);
+gboolean            xfconf_channel_get_array            (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GType first_value_type,
                                                          ...);
-gboolean            xfconf_channel_get_array_valist     (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GType first_value_type,
+gboolean            xfconf_channel_get_array_valist     (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GType first_value_type,
                                                          va_list var_args);
-GPtrArray *         xfconf_channel_get_arrayv           (XfconfChannel *channel,
-                                                         const gchar *property);
-gboolean            xfconf_channel_set_array            (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GType first_value_type,
+GPtrArray *         xfconf_channel_get_arrayv           (XfconfChannel *channel,
+                                                         const gchar *property);
+gboolean            xfconf_channel_set_array            (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GType first_value_type,
                                                          ...);
-gboolean            xfconf_channel_set_array_valist     (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GType first_value_type,
+gboolean            xfconf_channel_set_array_valist     (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GType first_value_type,
                                                          va_list var_args);
-gboolean            xfconf_channel_set_arrayv           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GPtrArray *values);
-gboolean            xfconf_channel_get_named_struct     (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gchar *struct_name,
-                                                         gpointer value_struct);
-gboolean            xfconf_channel_set_named_struct     (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gchar *struct_name,
-                                                         gpointer value_struct);
-gboolean            xfconf_channel_get_struct           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gpointer value_struct,
-                                                         GType first_member_type,
+gboolean            xfconf_channel_set_arrayv           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GPtrArray *values);
+gboolean            xfconf_channel_get_named_struct     (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gchar *struct_name,
+                                                         gpointer value_struct);
+gboolean            xfconf_channel_set_named_struct     (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gchar *struct_name,
+                                                         gpointer value_struct);
+gboolean            xfconf_channel_get_struct           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gpointer value_struct,
+                                                         GType first_member_type,
                                                          ...);
-gboolean            xfconf_channel_get_struct_valist    (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gpointer value_struct,
-                                                         GType first_member_type,
+gboolean            xfconf_channel_get_struct_valist    (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gpointer value_struct,
+                                                         GType first_member_type,
                                                          va_list var_args);
-gboolean            xfconf_channel_get_structv          (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gpointer value_struct,
-                                                         guint n_members,
-                                                         GType *member_types);
-gboolean            xfconf_channel_set_struct           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gpointer value_struct,
-                                                         GType first_member_type,
+gboolean            xfconf_channel_get_structv          (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gpointer value_struct,
+                                                         guint n_members,
+                                                         GType *member_types);
+gboolean            xfconf_channel_set_struct           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gpointer value_struct,
+                                                         GType first_member_type,
                                                          ...);
-gboolean            xfconf_channel_set_struct_valist    (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gpointer value_struct,
-                                                         GType first_member_type,
+gboolean            xfconf_channel_set_struct_valist    (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gpointer value_struct,
+                                                         GType first_member_type,
                                                          va_list var_args);
-gboolean            xfconf_channel_set_structv          (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gpointer value_struct,
-                                                         guint n_members,
-                                                         GType *member_types);
+gboolean            xfconf_channel_set_structv          (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gpointer value_struct,
+                                                         guint n_members,
+                                                         GType *member_types);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----XfconfChannel
-
+

Properties

-  "channel-name"             gchar*                : Read / Write / Construct Only
-  "is-singleton"             gboolean              : Read / Write / Construct Only
-  "property-base"            gchar*                : Read / Write / Construct Only
+  "channel-name"             gchar*                : Read / Write / Construct Only
+  "is-singleton"             gboolean              : Read / Write / Construct Only
+  "property-base"            gchar*                : Read / Write / Construct Only
-
+

Signals

-  "property-changed"                               : Run Last / Has Details
+  "property-changed"                               : Has Details
-
+

Description

An XfconfChannel is a representation of a restricted domain or @@ -196,9 +196,9 @@ configuration keys with the same names.

-
+

Details

-
+

XfconfChannel

typedef struct _XfconfChannel XfconfChannel;

@@ -206,9 +206,9 @@

-
+

xfconf_channel_get ()

-
XfconfChannel *     xfconf_channel_get                  (const gchar *channel_name);
+
XfconfChannel *     xfconf_channel_get                  (const gchar *channel_name);

Either creates a new channel, or fetches a singleton object for channel_name. This function always returns a valid object; no @@ -222,23 +222,20 @@

channel_name :

-A channel name. - +A channel name.

Returns :

- An XfconfChannel singleton. - - +An XfconfChannel singleton.

Since 4.5.91

-
+

xfconf_channel_new ()

-
XfconfChannel *     xfconf_channel_new                  (const gchar *channel_name);
+
XfconfChannel *     xfconf_channel_new                  (const gchar *channel_name);

Creates a new channel using name as the channel's identifier. This function always returns a valid object; no checking is done @@ -250,7 +247,7 @@ saves a little memory. However, xfconf_channel_new() can be useful in some cases where you want to tie an XfconfChannel's lifetime (and thus the lifetime of connected signals and bound -GObject properties) to the lifetime of another object. +GObject properties) to the lifetime of another object.

Also note that each channel has its own cache, so if you create @@ -262,24 +259,22 @@

channel_name :

-A channel name. - +A channel name.

Returns :

- A new XfconfChannel. Release with g_object_unref() - when no longer needed. - +A new XfconfChannel. Release with g_object_unref() +when no longer needed.
-
+

xfconf_channel_new_with_property_base ()

XfconfChannel *     xfconf_channel_new_with_property_base
-                                                        (const gchar *channel_name,
-                                                         const gchar *property_base);
+ (const gchar *channel_name, + const gchar *property_base);

Creates a new channel using name as the channel's identifier, restricting the accessible properties to be rooted at @@ -292,30 +287,26 @@

channel_name :

-A channel name. - +A channel name.

property_base :

-A property root name. - +A property root name.

Returns :

- A new XfconfChannel. Release with g_object_unref() - when no longer needed. - - +A new XfconfChannel. Release with g_object_unref() +when no longer needed.

Since 4.5.92

-
+

xfconf_channel_has_property ()

-
gboolean            xfconf_channel_has_property         (XfconfChannel *channel,
-                                                         const gchar *property);
+
gboolean            xfconf_channel_has_property         (XfconfChannel *channel,
+                                                         const gchar *property);

Checks to see if property exists on channel.

@@ -324,27 +315,25 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

Returns :

- TRUE if property exists, FALSE otherwise. - + +TRUE if property exists, FALSE otherwise.
-
+

xfconf_channel_is_property_locked ()

-
gboolean            xfconf_channel_is_property_locked   (XfconfChannel *channel,
-                                                         const gchar *property);
+
gboolean            xfconf_channel_is_property_locked   (XfconfChannel *channel,
+                                                         const gchar *property);

Queries whether or not property on channel is locked by system policy. If the property is locked, calls to @@ -356,33 +345,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

Returns :

- TRUE if the property is locked, FALSE otherwise. - - + +TRUE if the property is locked, FALSE otherwise.

Since 4.5.91

-
+

xfconf_channel_reset_property ()

void                xfconf_channel_reset_property       (XfconfChannel *channel,
-                                                         const gchar *property_base,
-                                                         gboolean recursive);
+ const gchar *property_base, + gboolean recursive);

Resets properties starting at (and including) property_base. -If recursive is TRUE, will also reset all properties that are +If recursive is TRUE, will also reset all properties that are under property_base in the property hierarchy.

@@ -394,76 +380,70 @@ it!), at best it can only reset properties to their default values.

-The property_base parameter can be NULL or the empty string (""), +The property_base parameter can be NULL or the empty string (""), in which case the channel root ("/") will be assumed. Of course, -TRUE must be passed for recursive in this case. +TRUE must be passed for recursive in this case.

- + - + - +

channel :

An XfconfChannel. -An XfconfChannel.

property_base :

A property tree root or property name. -A property tree root or property name.

recursive :

Whether to reset properties recursively. -Whether to reset properties recursively.

Since 4.5.91

-
+

xfconf_channel_get_properties ()

-
GHashTable *        xfconf_channel_get_properties       (XfconfChannel *channel,
-                                                         const gchar *property_base);
+
GHashTable *        xfconf_channel_get_properties       (XfconfChannel *channel,
+                                                         const gchar *property_base);

Retrieves multiple properties from channel and stores -them in a GHashTable in which the keys correspond to +them in a GHashTable in which the keys correspond to the string (gchar *) property names, and the values correspond to variant (GValue *) values. The keys and values are owned by the hash table and should be copied if needed. The value of the property specified by property_base (if it exists) and all sub-properties are retrieved. To retrieve all properties in the channel, -specify "/" or NULL for property_base. +specify "/" or NULL for property_base.

- + - + - +

channel :

An XfconfChannel. -An XfconfChannel.

property_base :

The base property name of properties to retrieve. -The base property name of properties to retrieve.

Returns :

 A newly-allocated GHashTable, which should be freed with - g_hash_table_destroy() when no longer needed. -A newly-allocated GHashTable, which should be freed with +g_hash_table_destroy() when no longer needed.
-
+

xfconf_channel_get_string ()

-
gchar *             xfconf_channel_get_string           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gchar *default_value);
+
gchar *             xfconf_channel_get_string           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gchar *default_value);

Retrieves the string value associated with property on channel.

@@ -472,34 +452,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

default_value :

-A fallback value. - +A fallback value.

Returns :

- A newly-allocated string which should be freed with g_free() - when no longer needed. If property is not in channel, - a g_strdup()ed copy of default_value is returned. - +A newly-allocated string which should be freed with g_free() +when no longer needed. If property is not in channel, +a g_strdup()ed copy of default_value is returned.
-
+

xfconf_channel_get_string_list ()

-
gchar **            xfconf_channel_get_string_list      (XfconfChannel *channel,
-                                                         const gchar *property);
+
gchar **            xfconf_channel_get_string_list      (XfconfChannel *channel,
+                                                         const gchar *property);

Retrieves the string list value associated with property on channel.

@@ -508,30 +484,27 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

Returns :

- A newly-allocated string list which should be freed with - g_strfreev() when no longer needed. If property is not in - channel, NULL is returned. - +A newly-allocated string list which should be freed with +g_strfreev() when no longer needed. If property is not in +channel, NULL is returned.
-
+

xfconf_channel_get_int ()

-
gint32              xfconf_channel_get_int              (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gint32 default_value);
+
gint32              xfconf_channel_get_int              (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gint32 default_value);

Retrieves the int value associated with property on channel.

@@ -540,34 +513,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

default_value :

-A fallback value. - +A fallback value.

Returns :

- The int value, or, if property is not in channel, - default_value is returned. - +The int value, or, if property is not in channel, +default_value is returned.
-
+

xfconf_channel_get_uint ()

-
guint32             xfconf_channel_get_uint             (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         guint32 default_value);
+
guint32             xfconf_channel_get_uint             (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         guint32 default_value);

Retrieves the unsigned int value associated with property on channel.

@@ -576,34 +545,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

default_value :

-A fallback value. - +A fallback value.

Returns :

- The uint value, or, if property is not in channel, - default_value is returned. - +The uint value, or, if property is not in channel, +default_value is returned.
-
+

xfconf_channel_get_uint64 ()

-
guint64             xfconf_channel_get_uint64           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         guint64 default_value);
+
guint64             xfconf_channel_get_uint64           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         guint64 default_value);

Retrieves the 64-bit int value associated with property on channel.

@@ -612,34 +577,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

default_value :

-A fallback value. - +A fallback value.

Returns :

- The uint64 value, or, if property is not in channel, - default_value is returned. - +The uint64 value, or, if property is not in channel, +default_value is returned.
-
+

xfconf_channel_get_double ()

-
gdouble             xfconf_channel_get_double           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gdouble default_value);
+
gdouble             xfconf_channel_get_double           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gdouble default_value);

Retrieves the double value associated with property on channel.

@@ -648,34 +609,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

default_value :

-A fallback value. - +A fallback value.

Returns :

- The double value, or, if property is not in channel, - default_value is returned. - +The double value, or, if property is not in channel, +default_value is returned.
-
+

xfconf_channel_get_bool ()

-
gboolean            xfconf_channel_get_bool             (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gboolean default_value);
+
gboolean            xfconf_channel_get_bool             (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gboolean default_value);

Retrieves the boolean value associated with property on channel.

@@ -684,34 +641,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

default_value :

-A fallback value. - +A fallback value.

Returns :

- The boolean value, or, if property is not in channel, - default_value is returned. - +The boolean value, or, if property is not in channel, +default_value is returned.
-
+

xfconf_channel_set_string ()

-
gboolean            xfconf_channel_set_string           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gchar *value);
+
gboolean            xfconf_channel_set_string           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gchar *value);

Sets value for property on channel in the configuration store.

@@ -720,33 +673,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

value :

-The value to set. - +The value to set.

Returns :

- TRUE on success, FALSE if an error occured. - + +TRUE on success, FALSE if an error occured.
-
+

xfconf_channel_set_string_list ()

-
gboolean            xfconf_channel_set_string_list      (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gchar * const *values);
+
gboolean            xfconf_channel_set_string_list      (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gchar * const *values);

Sets values for property on channel in the configuration store.

@@ -755,33 +705,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

values :

-The value to set. - +The value to set.

Returns :

- TRUE on success, FALSE if an error occured. - + +TRUE on success, FALSE if an error occured.
-
+

xfconf_channel_set_int ()

-
gboolean            xfconf_channel_set_int              (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gint32 value);
+
gboolean            xfconf_channel_set_int              (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gint32 value);

Sets value for property on channel in the configuration store.

@@ -790,33 +737,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

value :

-The value to set. - +The value to set.

Returns :

- TRUE on success, FALSE if an error occured. - + +TRUE on success, FALSE if an error occured.
-
+

xfconf_channel_set_uint ()

-
gboolean            xfconf_channel_set_uint             (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         guint32 value);
+
gboolean            xfconf_channel_set_uint             (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         guint32 value);

Sets value for property on channel in the configuration store.

@@ -825,33 +769,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

value :

-The value to set. - +The value to set.

Returns :

- TRUE on success, FALSE if an error occured. - + +TRUE on success, FALSE if an error occured.
-
+

xfconf_channel_set_uint64 ()

-
gboolean            xfconf_channel_set_uint64           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         guint64 value);
+
gboolean            xfconf_channel_set_uint64           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         guint64 value);

Sets value for property on channel in the configuration store.

@@ -860,33 +801,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

value :

-The value to set. - +The value to set.

Returns :

- TRUE on success, FALSE if an error occured. - + +TRUE on success, FALSE if an error occured.
-
+

xfconf_channel_set_double ()

-
gboolean            xfconf_channel_set_double           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gdouble value);
+
gboolean            xfconf_channel_set_double           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gdouble value);

Sets value for property on channel in the configuration store.

@@ -895,33 +833,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

value :

-The value to set. - +The value to set.

Returns :

- TRUE on success, FALSE if an error occured. - + +TRUE on success, FALSE if an error occured.
-
+

xfconf_channel_set_bool ()

-
gboolean            xfconf_channel_set_bool             (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gboolean value);
+
gboolean            xfconf_channel_set_bool             (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gboolean value);

Sets value for property on channel in the configuration store.

@@ -930,36 +865,33 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property name. - +A property name.

value :

-The value to set. - +The value to set.

Returns :

- TRUE on success, FALSE if an error occured. - + +TRUE on success, FALSE if an error occured.
-
+

xfconf_channel_get_property ()

-
gboolean            xfconf_channel_get_property         (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GValue *value);
+
gboolean            xfconf_channel_get_property         (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GValue *value);

Gets a property on channel and stores it in value. The caller is -responsible for calling g_value_unset() when finished with value. +responsible for calling g_value_unset() when finished with value.

This function can be called with an initialized or uninitialized @@ -976,34 +908,31 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A string property name. - +A string property name.

value :

-A GValue. - +A GValue.

Returns :

- TRUE if the property was retrieved successfully, - FALSE otherwise. - + +TRUE if the property was retrieved successfully, +FALSE otherwise.
-
+

xfconf_channel_set_property ()

-
gboolean            xfconf_channel_set_property         (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const GValue *value);
+
gboolean            xfconf_channel_set_property         (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const GValue *value);

Sets the value stored in value to a property on channel.

@@ -1016,33 +945,30 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A string property name. - +A string property name.

value :

-A GValue. - +A GValue.

Returns :

- TRUE if the property was set successfully, FALSE otherwise. - + +TRUE if the property was set successfully, FALSE otherwise.
-
+

xfconf_channel_get_array ()

-
gboolean            xfconf_channel_get_array            (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GType first_value_type,
+
gboolean            xfconf_channel_get_array            (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GType first_value_type,
                                                          ...);

 

 Gets an array property on channel.  The first_value_type
@@ -1061,39 +987,35 @@
 
 
 
channel :

-An XfconfChannel.
-
+An XfconfChannel.
 
 
 
property :

-A property string.
-
+A property string.
 
 
 
first_value_type :

-The type of the first argument in the array.
-
+The type of the first argument in the array.
 
 
 
... :

-A variable argument list of types and values.
-
+A variable argument list of types and values.
 
 
 
Returns :

- TRUE if the property was retrieved successfully,
-         FALSE otherwise.
-
+
+TRUE if the property was retrieved successfully,
+FALSE otherwise.
-
+

xfconf_channel_get_array_valist ()

-
gboolean            xfconf_channel_get_array_valist     (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GType first_value_type,
+
gboolean            xfconf_channel_get_array_valist     (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GType first_value_type,
                                                          va_list var_args);

 

 Gets an array property on channel.  See xfconf_channel_get_array()
@@ -1104,41 +1026,37 @@
 
 
 
channel :

-An XfconfChannel.
-
+An XfconfChannel.
 
 
 
property :

-A property string.
-
+A property string.
 
 
 
first_value_type :

-The type of the first argument in the array.
-
+The type of the first argument in the array.
 
 
 
var_args :

-A variable argument list of types and values.
-
+A variable argument list of types and values.
 
 
 
Returns :

- TRUE if the property was retrieved successfully,
-         FALSE otherwise.
-
+
+TRUE if the property was retrieved successfully,
+FALSE otherwise.
-
+

xfconf_channel_get_arrayv ()

-
GPtrArray *         xfconf_channel_get_arrayv           (XfconfChannel *channel,
-                                                         const gchar *property);
+
GPtrArray *         xfconf_channel_get_arrayv           (XfconfChannel *channel,
+                                                         const gchar *property);

Gets an array property on channel and returns it as -a GPtrArray, which can be freed with xfconf_array_free() +a GPtrArray, which can be freed with xfconf_array_free() when no longer needed.

@@ -1146,29 +1064,26 @@ - + - + - +

channel :

An XfconfChannel. -An XfconfChannel.

property :

A property string. -A property string.

Returns :

 A newly-allocated GPtrArray on success, or NULL - on failure. -A newly-allocated GPtrArray on success, or NULL +on failure.
-
+

xfconf_channel_set_array ()

-
gboolean            xfconf_channel_set_array            (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GType first_value_type,
+
gboolean            xfconf_channel_set_array            (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GType first_value_type,
                                                          ...);

 

 Sets an array property on channel.  The first_value_type
@@ -1187,38 +1102,34 @@
 
 
 
channel :

-An XfconfChannel.
-
+An XfconfChannel.
 
 
 
property :

-A property string.
-
+A property string.
 
 
 
first_value_type :

-The type of the first argument in the array.
-
+The type of the first argument in the array.
 
 
 
... :

-A variable argument list of types and values.
-
+A variable argument list of types and values.
 
 
 
Returns :

- TRUE if the property was set successfully, FALSE otherwise.
-
+
+TRUE if the property was set successfully, FALSE otherwise.
-
+

xfconf_channel_set_array_valist ()

-
gboolean            xfconf_channel_set_array_valist     (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GType first_value_type,
+
gboolean            xfconf_channel_set_array_valist     (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GType first_value_type,
                                                          va_list var_args);

 

 Sets an array property on channel.  See xfconf_channel_set_array()
@@ -1229,38 +1140,34 @@
 
 
 
channel :

-An XfconfChannel.
-
+An XfconfChannel.
 
 
 
property :

-A property string.
-
+A property string.
 
 
 
first_value_type :

-The type of the first argument in the array.
-
+The type of the first argument in the array.
 
 
 
var_args :

-A variable argument list of types and values.
-
+A variable argument list of types and values.
 
 
 
Returns :

- TRUE if the property was set successfully, FALSE otherwise.
-
+
+TRUE if the property was set successfully, FALSE otherwise.
-
+

xfconf_channel_set_arrayv ()

-
gboolean            xfconf_channel_set_arrayv           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         GPtrArray *values);
+
gboolean            xfconf_channel_set_arrayv           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         GPtrArray *values);

Sets an array property on channel, using the values in the provided values array. @@ -1270,34 +1177,31 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A property string. - +A property string.

values :

-A GPtrArray of GValues. - +A GPtrArray of GValues.

Returns :

- TRUE if the property was set successfully, FALSE otherwise. - + +TRUE if the property was set successfully, FALSE otherwise.
-
+

xfconf_channel_get_named_struct ()

-
gboolean            xfconf_channel_get_named_struct     (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gchar *struct_name,
-                                                         gpointer value_struct);
+
gboolean            xfconf_channel_get_named_struct     (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gchar *struct_name,
+                                                         gpointer value_struct);

Gets a property from channel and fills in value_struct using the retrieved values. The struct_name parameter is the same @@ -1309,40 +1213,36 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A string property name. - +A string property name.

struct_name :

-A string struct name. - +A string struct name.

value_struct :

-A pointer to a struct. - +A pointer to a struct.

Returns :

- TRUE if the property was retrieved successfully, - FALSE otherwise. - + +TRUE if the property was retrieved successfully, +FALSE otherwise.
-
+

xfconf_channel_set_named_struct ()

-
gboolean            xfconf_channel_set_named_struct     (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gchar *struct_name,
-                                                         gpointer value_struct);
+
gboolean            xfconf_channel_set_named_struct     (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gchar *struct_name,
+                                                         gpointer value_struct);

Sets a property on channel using the members of value_struct as the array of values. The struct_name parameter is the same @@ -1354,46 +1254,42 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A string property name. - +A string property name.

struct_name :

-A string struct name. - +A string struct name.

value_struct :

-A pointer to a struct. - +A pointer to a struct.

Returns :

- TRUE if the property was set successfully, - FALSE otherwise. - + +TRUE if the property was set successfully, +FALSE otherwise.
-
+

xfconf_channel_get_struct ()

-
gboolean            xfconf_channel_get_struct           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gpointer value_struct,
-                                                         GType first_member_type,
+
gboolean            xfconf_channel_get_struct           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gpointer value_struct,
+                                                         GType first_member_type,
                                                          ...);

 

 Gets a property on channel and stores it as members of the
 value_struct struct.  The first_member_type argument
-specifies the GType of the first member of the struct.  The
-variable argument list specifies the GTypes of the
+specifies the GType of the first member of the struct.  The
+variable argument list specifies the GTypes of the
 rest of the struct members, and should be terminated with
 G_TYPE_INVALID.
 

@@ -1413,45 +1309,40 @@
 
 
 
channel :

-An XfconfChannel.
-
+An XfconfChannel.
 
 
 
property :

-A string property name.
-
+A string property name.
 
 
 
value_struct :

-A pointer to a struct in which to store values.
-
+A pointer to a struct in which to store values.
 
 
 
first_member_type :

-The GType of the first member of value_struct.
-
+The GType of the first member of value_struct.
 
 
 
... :

-A variable argument list of GTypes.
-
+A variable argument list of GTypes.
 
 
 
Returns :

- TRUE if the property was retrieved successfully,
-         FALSE oherwise.
-
+
+TRUE if the property was retrieved successfully,
+FALSE oherwise.
-
+

xfconf_channel_get_struct_valist ()

-
gboolean            xfconf_channel_get_struct_valist    (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gpointer value_struct,
-                                                         GType first_member_type,
+
gboolean            xfconf_channel_get_struct_valist    (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gpointer value_struct,
+                                                         GType first_member_type,
                                                          va_list var_args);

 

 Gets a property on channel and stores it as members of the
@@ -1466,50 +1357,45 @@
 
 
 
channel :

-An XfconfChannel.
-
+An XfconfChannel.
 
 
 
property :

-A string property name.
-
+A string property name.
 
 
 
value_struct :

-A pointer to a struct in which to store values.
-
+A pointer to a struct in which to store values.
 
 
 
first_member_type :

-The GType of the first member of value_struct.
-
+The GType of the first member of value_struct.
 
 
 
var_args :

-A variable argument list of GTypes.
-
+A variable argument list of GTypes.
 
 
 
Returns :

- TRUE if the property was retrieved successfully,
-         FALSE oherwise.
-
+
+TRUE if the property was retrieved successfully,
+FALSE oherwise.
-
+

xfconf_channel_get_structv ()

-
gboolean            xfconf_channel_get_structv          (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         gpointer value_struct,
-                                                         guint n_members,
-                                                         GType *member_types);
+
gboolean            xfconf_channel_get_structv          (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         gpointer value_struct,
+                                                         guint n_members,
+                                                         GType *member_types);

Gets a property on channel and stores it as members of the value_struct struct. The member_types array should hold -a GType for each member of the struct. +a GType for each member of the struct.

Note: Struct members can only be non-pointer types such as int, @@ -1520,51 +1406,46 @@

channel :

-An XfconfChannel. - +An XfconfChannel.

property :

-A string property name. - +A string property name.

value_struct :

-A pointer to a struct in which to store values. - +A pointer to a struct in which to store values.

n_members :

-The number of data members in the struct. - +The number of data members in the struct.

member_types :

-An array of n_members GTypes. - +An array of n_members GTypes.

Returns :

- TRUE if the property was retrieved successfully, - FALSE oherwise. - + +TRUE if the property was retrieved successfully, +FALSE oherwise.
-
+

xfconf_channel_set_struct ()

-
gboolean            xfconf_channel_set_struct           (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gpointer value_struct,
-                                                         GType first_member_type,
+
gboolean            xfconf_channel_set_struct           (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gpointer value_struct,
+                                                         GType first_member_type,
                                                          ...);

 

 Sets a property on channel using the members of value_struct
 as a value array.  The first_member_type argument specifies
-the GType of the first member of the struct.  The variable
-argument list specifies the GTypes of the rest of the
+the GType of the first member of the struct.  The variable
+argument list specifies the GTypes of the rest of the
 struct members, and should be terminated with G_TYPE_INVALID.
 

 

@@ -1579,45 +1460,40 @@
 
 
 
channel :

-An XfconfChannel.
-
+An XfconfChannel.
 
 
 
property :

-A string property name.
-
+A string property name.
 
 
 
value_struct :

-A pointer to a struct from which to take values.
-
+A pointer to a struct from which to take values.
 
 
 
first_member_type :

-The GType of the first member of value_struct.
-
+The GType of the first member of value_struct.
 
 
 
... :

-A variable argument list of GTypes.
-
+A variable argument list of GTypes.
 
 
 
Returns :

- TRUE if the property was set successfully,
-         FALSE oherwise.
-
+
+TRUE if the property was set successfully,
+FALSE oherwise.
-
+

xfconf_channel_set_struct_valist ()

-
gboolean            xfconf_channel_set_struct_valist    (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gpointer value_struct,
-                                                         GType first_member_type,
+
gboolean            xfconf_channel_set_struct_valist    (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gpointer value_struct,
+                                                         GType first_member_type,
                                                          va_list var_args);

 

 Sets a property on channel using the members of value_struct
@@ -1628,49 +1504,44 @@
 
 
 
channel :

-An XfconfChannel.
-
+An XfconfChannel.
 
 
 
property :

-A string property name.
-
+A string property name.
 
 
 
value_struct :

-A pointer to a struct from which to take values.
-
+A pointer to a struct from which to take values.
 
 
 
first_member_type :

-The GType of the first member of value_struct.
-
+The GType of the first member of value_struct.
 
 
 
var_args :

-A variable argument list of GTypes.
-
+A variable argument list of GTypes.
 
 
 
Returns :

- TRUE if the property was set successfully,
-         FALSE oherwise.
-
+
+TRUE if the property was set successfully,
+FALSE oherwise.
-
+

xfconf_channel_set_structv ()

-
gboolean            xfconf_channel_set_structv          (XfconfChannel *channel,
-                                                         const gchar *property,
-                                                         const gpointer value_struct,
-                                                         guint n_members,
-                                                         GType *member_types);
+
gboolean            xfconf_channel_set_structv          (XfconfChannel *channel,
+                                                         const gchar *property,
+                                                         const gpointer value_struct,
+                                                         guint n_members,
+                                                         GType *member_types);

Sets a property on channel using the members of value_struct -as a value array. The member_types array should hold a GType +as a value array. The member_types array should hold a GType for each member of the struct.

@@ -1678,86 +1549,73 @@ - + - + - + - + - + - +

channel :

An XfconfChannel. -An XfconfChannel.

property :

A string property name. -A string property name.

value_struct :

A pointer to a struct from which to take values. -A pointer to a struct from which to take values.

n_members :

The number of data members in the struct. -The number of data members in the struct.

member_types :

An array of n_members GTypes. -An array of n_members GTypes.

Returns :

 TRUE if the property was set successfully, - FALSE oherwise. - +TRUE if the property was set successfully, +FALSE oherwise.
-
+

Property Details

-
+

The "channel-name" property

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

The name of the channel.

Default value: NULL

-
+

The "is-singleton" property

-
  "is-singleton"             gboolean              : Read / Write / Construct Only
+
  "is-singleton"             gboolean              : Read / Write / Construct Only

Whether or not this instance is a singleton.

Default value: TRUE

-
+

The "property-base" property

-
  "property-base"            gchar*                : Read / Write / Construct Only
+
  "property-base"            gchar*                : Read / Write / Construct Only

Base property path.

Default value: NULL

-
+

Signal Details

-
+

The "property-changed" signal

void                user_function                      (XfconfChannel *channel,
-                                                        gchar         *property,
-                                                        GValue        *value,
-                                                        gpointer       user_data)      : Run Last / Has Details
+ gchar *property, + GValue *value, + gpointer user_data) : Has Details

Emitted whenever a property on channel has changed. If the change was caused by the removal of property, value will be unset; you should test this with

-
- - - - - - - - 
1
G_VALUE_TYPE(value) == G_TYPE_INVALID
-
- +
+G_VALUE_TYPE(value) == G_TYPE_INVALID
+

@@ -1765,18 +1623,15 @@ - + - + - + @@ -1789,6 +1644,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru xfconf-4.8.0/docs/reference/html/xfconf-xfconf-errors.html xfconf-4.8.1/docs/reference/html/xfconf-xfconf-errors.html --- xfconf-4.8.0/docs/reference/html/xfconf-xfconf-errors.html 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/xfconf-xfconf-errors.html 2011-12-23 16:05:30.000000000 +0000 @@ -3,12 +3,12 @@ Error Reporting - + - + @@ -26,7 +26,7 @@ Description

channel :

The XfconfChannel emitting the signal. -The XfconfChannel emitting the signal.

property :

The property that changed. -The property that changed.

value :

The new value. -The new value.

user_data :
-
+
@@ -35,34 +35,32 @@
-
+

Synopsis

#define             XFCONF_ERROR
 enum                XfconfError;
-
+

Description

Both the Xfconf daemon and library provide error information via the -use of GErrors. +use of GErrors.

-
+

Details

-
+

XFCONF_ERROR

-
#define XFCONF_ERROR       (xfconf_get_error_quark())
-
+
#define             XFCONF_ERROR

-The GError error domain for Xfconf. +The GError error domain for Xfconf.

-
+

enum XfconfError

-
typedef enum
-{
+
typedef enum {
     XFCONF_ERROR_UNKNOWN = 0,
     XFCONF_ERROR_CHANNEL_NOT_FOUND,
     XFCONF_ERROR_PROPERTY_NOT_FOUND,
@@ -139,6 +137,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru xfconf-4.8.0/docs/reference/html/xfconf-xfconf.html xfconf-4.8.1/docs/reference/html/xfconf-xfconf.html --- xfconf-4.8.0/docs/reference/html/xfconf-xfconf.html 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/xfconf-xfconf.html 2011-12-23 16:05:30.000000000 +0000 @@ -3,12 +3,12 @@ Xfconf Library Core - + - + @@ -26,7 +26,7 @@ Description -
+
@@ -35,17 +35,17 @@
-
+

Synopsis

-
gboolean            xfconf_init                         (GError **error);
+
gboolean            xfconf_init                         (GError **error);
 void                xfconf_shutdown                     (void);
-void                xfconf_named_struct_register        (const gchar *struct_name,
-                                                         guint n_members,
-                                                         const GType *member_types);
-void                xfconf_array_free                   (GPtrArray *arr);
+void                xfconf_named_struct_register        (const gchar *struct_name,
+                                                         guint n_members,
+                                                         const GType *member_types);
+void                xfconf_array_free                   (GPtrArray *arr);
-
+

Description

Before libxfconf can be used, it must be initialized by calling @@ -56,11 +56,11 @@ resources.

-
+

Details

-
+

xfconf_init ()

-
gboolean            xfconf_init                         (GError **error);
+
gboolean            xfconf_init                         (GError **error);

Initializes the Xfconf library. Can be called multiple times with no adverse effects. @@ -70,20 +70,19 @@

error :

-An error return. - +An error return.

Returns :

- TRUE if the library was initialized succesfully, FALSE on - error. If there is an error error will be set. - + +TRUE if the library was initialized succesfully, FALSE on +error. If there is an error error will be set.
-
+

xfconf_shutdown ()

void                xfconf_shutdown                     (void);

@@ -93,11 +92,11 @@

-
+

xfconf_named_struct_register ()

-
void                xfconf_named_struct_register        (const gchar *struct_name,
-                                                         guint n_members,
-                                                         const GType *member_types);
+
void                xfconf_named_struct_register        (const gchar *struct_name,
+                                                         guint n_members,
+                                                         const GType *member_types);

Registers a named struct for use with xfconf_channel_get_named_struct() and xfconf_channel_set_named_struct(). @@ -107,37 +106,33 @@

struct_name :

-The unique name of the struct to register. - +The unique name of the struct to register.

n_members :

-The number of data members in the struct. - +The number of data members in the struct.

member_types :

-An array of the GTypes of the struct members. - +An array of the GTypes of the struct members.
-
+

xfconf_array_free ()

-
void                xfconf_array_free                   (GPtrArray *arr);
+
void                xfconf_array_free                   (GPtrArray *arr);

-Properly frees a GPtrArray structure containing a list of -GValues. This will also cause the contents of the +Properly frees a GPtrArray structure containing a list of +GValues. This will also cause the contents of the values to be freed as well.

- +

arr :

A GPtrArray of GValues. -A GPtrArray of GValues.
@@ -145,6 +140,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru xfconf-4.8.0/docs/reference/html/xfconf-xfconf-types.html xfconf-4.8.1/docs/reference/html/xfconf-xfconf-types.html --- xfconf-4.8.0/docs/reference/html/xfconf-xfconf-types.html 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/html/xfconf-xfconf-types.html 2011-12-23 16:05:30.000000000 +0000 @@ -3,12 +3,12 @@ Xfconf Types - + - + @@ -26,7 +26,7 @@ Description -
+
@@ -35,17 +35,17 @@
-
+

Synopsis

-
gint16              xfconf_g_value_get_int16            (const GValue *value);
-guint16             xfconf_g_value_get_uint16           (const GValue *value);
-void                xfconf_g_value_set_int16            (GValue *value,
-                                                         gint16 v_int16);
-void                xfconf_g_value_set_uint16           (GValue *value,
-                                                         guint16 v_uint16);
+
gint16              xfconf_g_value_get_int16            (const GValue *value);
+guint16             xfconf_g_value_get_uint16           (const GValue *value);
+void                xfconf_g_value_set_int16            (GValue *value,
+                                                         gint16 v_int16);
+void                xfconf_g_value_set_uint16           (GValue *value,
+                                                         guint16 v_uint16);
-
+

Description

libgobject lacks GObject fundamental types for 16-bit signed and unsigned @@ -53,11 +53,11 @@ these primitive types are provided here.

-
+

Details

-
+

xfconf_g_value_get_int16 ()

-
gint16              xfconf_g_value_get_int16            (const GValue *value);
+
gint16              xfconf_g_value_get_int16            (const GValue *value);

Retrieves a 16-bit signed value from value.

@@ -66,21 +66,19 @@

value :

-A GValue. - +A GValue.

Returns :

- A gint16. - +A gint16.
-
+

xfconf_g_value_get_uint16 ()

-
guint16             xfconf_g_value_get_uint16           (const GValue *value);
+
guint16             xfconf_g_value_get_uint16           (const GValue *value);

Retrieves a 16-bit unsigned value from value.

@@ -89,22 +87,20 @@

value :

-A GValue. - +A GValue.

Returns :

- A guint16. - +A guint16.
-
+

xfconf_g_value_set_int16 ()

-
void                xfconf_g_value_set_int16            (GValue *value,
-                                                         gint16 v_int16);
+
void                xfconf_g_value_set_int16            (GValue *value,
+                                                         gint16 v_int16);

Sets value using a signed 16-bit integer.

@@ -113,22 +109,20 @@

value :

-A GValue. - +A GValue.

v_int16 :

-A gint16. - +A gint16.
-
+

xfconf_g_value_set_uint16 ()

-
void                xfconf_g_value_set_uint16           (GValue *value,
-                                                         guint16 v_uint16);
+
void                xfconf_g_value_set_uint16           (GValue *value,
+                                                         guint16 v_uint16);

Sets value using an unsigned 16-bit integer.

@@ -137,13 +131,11 @@

value :

-A GValue. - +A GValue.

v_uint16 :

-A guint16. - +A guint16.
@@ -152,6 +144,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru xfconf-4.8.0/docs/reference/Makefile.in xfconf-4.8.1/docs/reference/Makefile.in --- xfconf-4.8.0/docs/reference/Makefile.in 2011-01-16 14:51:55.000000000 +0000 +++ xfconf-4.8.1/docs/reference/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -87,6 +87,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -104,9 +105,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -135,6 +139,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -180,6 +185,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@ @@ -298,10 +304,10 @@ $(GLIB_LIBS) \ $(GOBJECT_LIBS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --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) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@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 @@ -312,15 +318,18 @@ # GPATH = $(srcdir) TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +SETUP_FILES = \ + $(content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + # Other files to distribute -EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ - version.xml.in -DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - pdf-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ - $(srcdir)/pdf.stamp +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in +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 \ @@ -544,22 +553,47 @@ $(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) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @echo ' DOC Scanning header files' + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(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) ; \ + 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 @@ -569,10 +603,14 @@ #### 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) +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 @@ -584,13 +622,13 @@ #### xml #### sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' + @echo ' DOC Building XML' @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - 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) + 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 @@ -599,58 +637,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 + @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)"; \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_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=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + 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 'gtk-doc: Building PDF' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/$(DOC_MODULE).pdf - @mkpdf_imgdirs=""; \ + @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_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ if test $$? != 0; then \ - mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ fi; \ done; \ fi; \ - cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + 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).pdf \ - $(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)"; \ @@ -659,14 +718,12 @@ 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; \ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ fi @@ -688,15 +745,15 @@ @ENABLE_GTK_DOC_FALSE@ @false dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - $(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 diff -Nru xfconf-4.8.0/docs/reference/tmpl/xfconf-channel.sgml xfconf-4.8.1/docs/reference/tmpl/xfconf-channel.sgml --- xfconf-4.8.0/docs/reference/tmpl/xfconf-channel.sgml 2011-01-16 14:52:21.000000000 +0000 +++ xfconf-4.8.1/docs/reference/tmpl/xfconf-channel.sgml 2011-12-23 16:05:30.000000000 +0000 @@ -304,7 +304,7 @@ @channel: @property: @first_value_type: -@Varargs: +@...: @Returns: @@ -338,7 +338,7 @@ @channel: @property: @first_value_type: -@Varargs: +@...: @Returns: @@ -398,7 +398,7 @@ @property: @value_struct: @first_member_type: -@Varargs: +@...: @Returns: @@ -437,7 +437,7 @@ @property: @value_struct: @first_member_type: -@Varargs: +@...: @Returns: diff -Nru xfconf-4.8.0/docs/reference/version.xml xfconf-4.8.1/docs/reference/version.xml --- xfconf-4.8.0/docs/reference/version.xml 2011-01-16 14:52:04.000000000 +0000 +++ xfconf-4.8.1/docs/reference/version.xml 2011-12-23 16:05:21.000000000 +0000 @@ -1 +1 @@ -4.8.0 +4.8.1 diff -Nru xfconf-4.8.0/docs/spec/Makefile.in xfconf-4.8.1/docs/spec/Makefile.in --- xfconf-4.8.0/docs/spec/Makefile.in 2011-01-16 14:51:55.000000000 +0000 +++ xfconf-4.8.1/docs/spec/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -80,6 +80,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -97,9 +98,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -128,6 +132,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -173,6 +178,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@ diff -Nru xfconf-4.8.0/gtk-doc.make xfconf-4.8.1/gtk-doc.make --- xfconf-4.8.0/gtk-doc.make 2011-01-16 14:51:52.000000000 +0000 +++ xfconf-4.8.1/gtk-doc.make 2011-12-23 16:05:12.000000000 +0000 @@ -5,12 +5,12 @@ #################################### if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) GTKDOC_RUN = $(LIBTOOL) --mode=execute else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) GTKDOC_RUN = endif @@ -23,17 +23,19 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) -EXTRA_DIST = \ +SETUP_FILES = \ $(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 \ - pdf-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ - $(srcdir)/pdf.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 \ @@ -70,22 +72,47 @@ $(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) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @echo ' DOC Scanning header files' + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(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) ; \ + 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 @@ -95,10 +122,14 @@ #### 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) +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 @@ -110,13 +141,13 @@ #### xml #### sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' + @echo ' DOC Building XML' @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - 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) + 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 @@ -125,58 +156,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 + @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)"; \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_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=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + 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 'gtk-doc: Building PDF' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/$(DOC_MODULE).pdf - @mkpdf_imgdirs=""; \ + @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_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ if test $$? != 0; then \ - mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ fi; \ done; \ fi; \ - cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + 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).pdf \ - $(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)"; \ @@ -185,14 +237,12 @@ 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; \ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ fi @@ -217,14 +267,14 @@ endif dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - $(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 diff -Nru xfconf-4.8.0/ltmain.sh xfconf-4.8.1/ltmain.sh --- xfconf-4.8.0/ltmain.sh 2011-01-16 14:51:51.000000000 +0000 +++ xfconf-4.8.1/ltmain.sh 2011-12-23 16:05:11.000000000 +0000 @@ -1,10 +1,9 @@ -# Generated from ltmain.m4sh. -# libtool (GNU libtool) 2.2.10 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 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. @@ -42,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --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 @@ -70,17 +70,19 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.10 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # # Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.2.10 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3175 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -135,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -163,6 +160,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: @@ -177,17 +195,31 @@ # those functions but instead duplicate the functionality here. func_dirname_and_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"` -} + # 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 -# Generated shell functions inserted here. # These SED scripts presuppose an absolute path with a trailing slash. pathcar='s,^/\([^/]*\).*$,\1,' @@ -351,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -370,6 +402,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. @@ -398,7 +439,7 @@ # name if it has been set yet. func_echo () { - $ECHO "$progname${mode+: }$mode: $*" + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" } # func_verbose arg... @@ -424,14 +465,14 @@ # 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: : @@ -650,11 +691,30 @@ 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 () { + $opt_debug + $SED -n '/(C)/!b go :more /\./!{ @@ -676,6 +736,8 @@ # Echo short help message to standard output and exit. func_usage () { + $opt_debug + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// @@ -692,7 +754,10 @@ # unless 'noexit' is passed as argument. func_help () { + $opt_debug + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -702,10 +767,14 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p - }' < "$progpath" + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" ret=$? if test -z "$1"; then exit $ret @@ -717,12 +786,39 @@ # exit_cmd. func_missing_arg () { + $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=: @@ -732,25 +828,64 @@ magic_exe="%%%MAGIC EXE variable%%%" # Global variables. -# $mode is unset nonopt= -execute_dlfiles= preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" extracted_archives= extracted_serial=0 -opt_dry_run=false -opt_duplicate_deps=false -opt_silent=false -opt_debug=: - # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. exec_cmd= +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "${1}=\$${1}\${2}" +} # func_append may be replaced by extended shell implementation + +# func_append_quoted var value +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +func_append_quoted () +{ + func_quote_for_eval "${2}" + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" +} # func_append_quoted may be replaced by extended shell implementation + + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "${@}"` +} # func_arith may be replaced by extended shell implementation + + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -840,129 +975,209 @@ 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 + + exit $EXIT_MISMATCH + 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 - # 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_warning=: +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_verbose=false + opt_preserve_dup_deps=: ;; - - --no-quiet|--no-silent) - preserve_args="$preserve_args $opt" - opt_silent=false + --features) + opt_features=: +func_features ;; - - --verbose| -v) preserve_args="$preserve_args $opt" + --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 - opt_verbose=: +func_append preserve_args " $opt" ;; - - --no-verbose) preserve_args="$preserve_args $opt" + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; + --no-verbose) opt_verbose=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 + --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=: ;; - --help-all) opt_help=': help-all' ;; - --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*) @@ -970,82 +1185,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 - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi + # 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 - test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} - # 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. @@ -1110,12 +1287,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 @@ -1161,6 +1335,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. @@ -1173,8 +1378,7 @@ 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` @@ -1193,8 +1397,7 @@ 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` @@ -1225,43 +1428,523 @@ } - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# but don't create it if we're doing a dry run. -func_write_libtool_object () + +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# but don't create it if we're doing a dry run. +func_write_libtool_object () +{ + write_libobj=${1} + if test "$build_libtool_libs" = yes; then + write_lobj=\'${2}\' + else + write_lobj=none + fi + + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T </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 () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' - else - write_lobj=none - fi + $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 - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - $opt_dry_run || { - cat >${write_libobj}T < "$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 @@ -1515,7 +2195,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" \ @@ -1562,11 +2242,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' @@ -1611,13 +2291,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. @@ -1793,7 +2473,7 @@ ;; *) - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" ;; esac @@ -1808,13 +2488,13 @@ else { func_help noexit - for mode in compile link execute install finish uninstall clean; do + 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 mode in compile link execute install finish uninstall clean; do + for opt_mode in compile link execute install finish uninstall clean; do echo func_mode_help done @@ -1843,13 +2523,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" @@ -1871,7 +2554,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'" @@ -1928,8 +2611,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 @@ -1961,22 +2643,59 @@ 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. @@ -1986,7 +2705,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 @@ -1995,53 +2714,55 @@ # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - 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\" + 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'" + 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 "----------------------------------------------------------------------" + 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 exit $EXIT_SUCCESS } -test "$mode" = finish && func_mode_finish ${1+"$@"} +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -2066,7 +2787,7 @@ # 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=: ;; @@ -2086,7 +2807,7 @@ do arg2= if test -n "$dest"; then - files="$files $dest" + func_append files " $dest" dest=$arg continue fi @@ -2124,11 +2845,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 - install_shared_prog="$install_shared_prog $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -2140,7 +2861,7 @@ if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else func_quote_for_eval "$install_override_mode" - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" + func_append install_shared_prog " -m $func_quote_for_eval_result" fi fi @@ -2198,10 +2919,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" @@ -2215,19 +2939,19 @@ 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. @@ -2304,7 +3028,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) @@ -2478,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -2501,7 +3227,7 @@ fi } -test "$mode" = install && func_mode_install ${1+"$@"} +test "$opt_mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -2548,6 +3274,18 @@ #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. */\ " @@ -2559,8 +3297,9 @@ # Add our own program objects to the symbol list. 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 @@ -2609,10 +3348,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 || { @@ -2650,26 +3431,9 @@ 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 }," @@ -2709,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -2725,7 +3489,7 @@ for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) symtab_cflags="$symtab_cflags $arg" ;; + *) func_append symtab_cflags " $arg" ;; esac done @@ -2788,7 +3552,8 @@ # 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 (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - win32_nmres=`eval $NM -f posix -A $1 | + 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 /{ @@ -2817,6 +3582,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 @@ -3095,14 +3985,17 @@ # 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 + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -3195,6 +4088,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 "\ @@ -3209,14 +4114,6 @@ " 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. @@ -3234,166 +4131,6 @@ } -# 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 - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_path_result=`cygpath -w "$1" | - $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_stripname : : "$1" - func_to_host_pathlist_tmp1=$func_stripname_result - case $build in - *mingw* ) # Actually, msys. - # Awkward: cmd appends spaces to result. - func_to_host_pathlist_result=` - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | - $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_append func_to_host_pathlist_result ";$func_to_host_path_result" - fi - fi - fi - 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_append 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 # Must ONLY be called from within func_mode_link because @@ -3563,14 +4300,14 @@ EOF cat </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 | @@ -6999,7 +7827,7 @@ 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 @@ -7024,7 +7852,7 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -7040,7 +7868,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 @@ -7053,7 +7881,7 @@ potlib="$potent_lib" # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -7078,7 +7906,7 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -7182,7 +8010,7 @@ *) case " $deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7192,10 +8020,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" @@ -7207,15 +8035,22 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" + 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 @@ -7224,18 +8059,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_append perm_rpath " $libdir" ;; esac fi done @@ -7243,17 +8078,13 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -7261,7 +8092,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 @@ -7287,7 +8118,7 @@ linknames= for link do - linknames="$linknames $link" + func_append linknames " $link" done # Use standard objects if they are pic @@ -7298,7 +8129,7 @@ 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= @@ -7329,13 +8160,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. @@ -7369,7 +8232,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 @@ -7379,7 +8242,7 @@ case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs="$tmp_deplibs $test_deplib" + func_append tmp_deplibs " $test_deplib" ;; esac done @@ -7399,21 +8262,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 @@ -7475,10 +8338,13 @@ 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" + 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" @@ -7492,10 +8358,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..." @@ -7546,7 +8414,7 @@ if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - delfiles="$delfiles $output" + func_append delfiles " $output" else output= @@ -7580,7 +8448,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" ) @@ -7613,7 +8481,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 @@ -7654,10 +8522,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 @@ -7673,7 +8541,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" ) @@ -7685,7 +8553,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 @@ -7769,13 +8637,16 @@ 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 "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test @@ -7849,8 +8720,8 @@ 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 @@ -7870,7 +8741,7 @@ *) case " $compile_deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7880,17 +8751,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. @@ -7898,7 +8769,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 @@ -7917,18 +8788,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 @@ -7937,12 +8808,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 @@ -7968,18 +8839,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 @@ -8030,6 +8901,12 @@ 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}"' @@ -8052,7 +8929,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 @@ -8060,7 +8937,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 @@ -8075,6 +8952,13 @@ $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 @@ -8108,6 +8992,12 @@ 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" @@ -8205,7 +9095,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" @@ -8213,10 +9103,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. @@ -8227,10 +9117,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 @@ -8248,7 +9138,7 @@ else 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= @@ -8272,18 +9162,30 @@ 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 + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds + 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..." @@ -8377,12 +9279,23 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` 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" + ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; + *) func_append newdependency_libs " $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -8396,9 +9309,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" @@ -8415,7 +9328,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 @@ -8427,7 +9340,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlfiles="$newdlfiles $abs" + func_append newdlfiles " $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -8436,7 +9349,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlprefiles="$newdlprefiles $abs" + func_append newdlprefiles " $abs" done dlprefiles="$newdlprefiles" fi @@ -8521,7 +9434,7 @@ exit $EXIT_SUCCESS } -{ test "$mode" = link || test "$mode" = relink; } && +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && func_mode_link ${1+"$@"} @@ -8541,9 +9454,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 @@ -8552,24 +9465,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 @@ -8595,18 +9507,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 @@ -8634,19 +9545,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) @@ -8656,7 +9567,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. @@ -8665,7 +9576,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 @@ -8673,12 +9584,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 @@ -8686,7 +9597,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 @@ -8698,16 +9608,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 xfconf-4.8.0/Makefile.in xfconf-4.8.1/Makefile.in --- xfconf-4.8.0/Makefile.in 2011-01-16 14:51:56.000000000 +0000 +++ xfconf-4.8.1/Makefile.in 2011-12-23 16:05:16.000000000 +0000 @@ -136,6 +136,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -153,9 +154,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -184,6 +188,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -229,6 +234,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@ diff -Nru xfconf-4.8.0/NEWS xfconf-4.8.1/NEWS --- xfconf-4.8.0/NEWS 2011-01-16 14:51:44.000000000 +0000 +++ xfconf-4.8.1/NEWS 2011-12-23 16:05:11.000000000 +0000 @@ -1,3 +1,12 @@ +Xfconf 4.8.1 +============ + + * Fix double free crash (bug #8169). + * Fix compiler warnings on solaris. + * Avoid gcc 4.6 compiler warning. + * Allow installation of the helpers in a custom location. + * Updated translations: hr, is, ko, ms, nl, ru, sk, te, tr, zh_CN. + Xfconf 4.8.0 ============ diff -Nru xfconf-4.8.0/po/hr.po xfconf-4.8.1/po/hr.po --- xfconf-4.8.0/po/hr.po 1970-01-01 00:00:00.000000000 +0000 +++ xfconf-4.8.1/po/hr.po 2011-12-23 16:05:11.000000000 +0000 @@ -0,0 +1,358 @@ +# Croazian translation of xconf package.. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xconf package. +# Ivica Kolić , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: xconf\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-11-05 11:20+0000\n" +"PO-Revision-Date: 2011-11-05 17:23+0100\n" +"Last-Translator: Ivica Kolić \n" +"Language-Team: Hrvatski <>\n" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" +"X-Poedit-Country: CROATIA\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" +"X-Poedit-Language: Croatian\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../xfconf/xfconf-cache.c:875 +#, c-format +msgid "Failed to make ResetProperty DBus call" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:277 +#, c-format +msgid "Unable to create configuration directory \"%s\"" +msgstr "Nije moguće napraviti konfiguracijski direktorij \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:322 +#: ../xfconfd/xfconf-daemon.c:238 +#, c-format +msgid "Permission denied while modifying property \"%s\" on channel \"%s\"" +msgstr "Dozvola odbijena dok je mjenjano svojstvo \\%s\" na kanalu \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:387 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:469 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:634 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:654 +#, c-format +msgid "Property \"%s\" does not exist on channel \"%s\"" +msgstr "Svojstvo \"%s\" ne postoji na kanalu \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:601 +#, c-format +msgid "Unable to remove channel \"%s\": %s" +msgstr "Nije moguće ukloniti kanal \"%s\": %s" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1298 +#, c-format +msgid "Invalid type for : \"%s\"" +msgstr "Neispravni tip za : \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1314 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1390 +#, c-format +msgid "Unable to parse value of type \"%s\" from \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1370 +#, c-format +msgid "The type attribute of cannot be an array" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1379 +#, c-format +msgid "Invalid type for : \"%s\"" +msgstr "Pogrešna vrsta za : \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1655 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1904 +#, c-format +msgid "Channel \"%s\" does not exist" +msgstr "Kanal \"%s\" ne postoji" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1962 +#, c-format +msgid "Unable to write channel \"%s\": %s" +msgstr "" + +#: ../xfconfd/xfconf-backend-factory.c:76 +#, c-format +msgid "Unable to find Xfconf backend of type \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:103 +#, c-format +msgid "Property names must start with a '/' character" +msgstr "Imena svojstava moraju počinjati sa znakom '/'" + +#: ../xfconfd/xfconf-backend.c:112 +#, c-format +msgid "The root element ('/') is not a valid property name" +msgstr "Korijenski element ('/') nije valjano ime svojstva" + +#: ../xfconfd/xfconf-backend.c:126 +#, c-format +msgid "" +"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', " +"'-', '<' and '>', as well as '/' as a separator" +msgstr "" +"Imena svojstava mogu sadržavati samo ASCII znakove A-Z, a-z, 0-9, '_', '-', " +"'<' i '>'kao i '/' kao razdjelnik" + +#: ../xfconfd/xfconf-backend.c:135 +#, c-format +msgid "Property names cannot have two or more consecutive '/' characters" +msgstr "Imena svojstava ne mogu imati dva '/' znaka za redom" + +#: ../xfconfd/xfconf-backend.c:146 +#, c-format +msgid "Property names cannot end with a '/' character" +msgstr "Imena svojstava ne mogu završavati sa znakom '/'" + +#: ../xfconfd/xfconf-backend.c:163 +#, c-format +msgid "Channel name cannot be an empty string" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:176 +#, c-format +msgid "" +"Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and " +"'-'" +msgstr "" +"Imena kanala mogu sadržavati samo ASCII znakove A-Z, a-z, 0-9, '_', i '-'" + +#: ../xfconfd/xfconf-backend.c:398 +#, c-format +msgid "" +"The property name can only be empty or \"/\" if a recursive reset was " +"specified" +msgstr "" + +#: ../xfconfd/main.c:134 +msgid "Prints the xfconfd version." +msgstr "Ispis xconfd verzije" + +#: ../xfconfd/main.c:136 +msgid "" +"Configuration backends to use. The first backend specified is opened read/" +"write; the others, read-only." +msgstr "" + +#: ../xfconfd/main.c:139 +msgid "Fork into background after starting; only useful for testing purposes" +msgstr "" + +#: ../xfconfd/main.c:159 +msgid "Xfce Configuration Daemon" +msgstr "" + +#: ../xfconfd/main.c:165 +msgid "Xfce configuration daemon" +msgstr "" + +#: ../xfconfd/main.c:167 +msgid "Report bugs to http://bugs.xfce.org/\n" +msgstr "Prijavite probleme na http://bugs.xfce.org/\n" + +#: ../xfconfd/main.c:170 +#, c-format +msgid "Error parsing options: %s\n" +msgstr "" + +#: ../xfconfd/xfconf-daemon.c:482 +#, c-format +msgid "Another Xfconf daemon is already running" +msgstr "" + +#: ../xfconfd/xfconf-daemon.c:517 +#, c-format +msgid "No backends could be started" +msgstr "" + +#: ../xfconf-query/main.c:92 +#, c-format +msgid "Property '%s' changed: %s\n" +msgstr "Svojstvo '%s' promjenjeno: %s\n" + +#: ../xfconf-query/main.c:97 +#, c-format +msgid "Property '%s' changed\n" +msgstr "Svojstvo '%s' promjenjeno\n" + +#: ../xfconf-query/main.c:102 +#, c-format +msgid "Property '%s' removed\n" +msgstr "Svojstvo '%s' uklonjeno\n" + +#: ../xfconf-query/main.c:111 +#, c-format +msgid "Export method not yet implemented" +msgstr "Metoda izvoza nije još primjenjena" + +#: ../xfconf-query/main.c:125 +#, c-format +msgid "Export not yet implemented" +msgstr "Izvoz još nije promjenjen" + +#: ../xfconf-query/main.c:191 +msgid "Version information" +msgstr "Informacija o verziji" + +#: ../xfconf-query/main.c:195 +msgid "The channel to query/modify" +msgstr "" + +#: ../xfconf-query/main.c:199 +msgid "The property to query/modify" +msgstr "" + +#: ../xfconf-query/main.c:203 +msgid "The new value to set for the property" +msgstr "Postaviti novu vrijednost za svojstvo" + +#: ../xfconf-query/main.c:207 +msgid "List properties (or channels if -c is not specified)" +msgstr "Listaj svojstva (ili kanale ako -c nije određeno)" + +#: ../xfconf-query/main.c:211 +msgid "Verbose output" +msgstr "" + +#: ../xfconf-query/main.c:215 +msgid "Create a new property if it does not already exist" +msgstr "Napravi novo svojstvo ako već ne postoji" + +#: ../xfconf-query/main.c:219 +msgid "Specify the property value type" +msgstr "Odredi tip vrijednosti svojstva" + +#: ../xfconf-query/main.c:223 +msgid "Reset property" +msgstr "Ponovno pokreni svojstvo" + +#: ../xfconf-query/main.c:227 +msgid "Recursive (use with -r)" +msgstr "Rekurzivno (koristiti sa -r)" + +#: ../xfconf-query/main.c:231 +msgid "Force array even if only one element" +msgstr "" + +#: ../xfconf-query/main.c:245 +msgid "Monitor a channel for property changes" +msgstr "" + +#: ../xfconf-query/main.c:349 +#, c-format +msgid "Start monitoring channel '%s':" +msgstr "Započnite praćenje kanala '%s':" + +#: ../xfconf-query/main.c:371 +#, c-format +msgid "Property \"%s\" does not exist on channel \"%s\".\n" +msgstr "Svojstvo \"%s\" ne postoji na kanalu \"%s\" \n" + +#: ../xfconf-query/main.c:379 ../xfconf-query/main.c:397 +msgid "(unknown)" +msgstr "(nepoznato)" + +#: ../xfconf-query/main.c:388 +#, c-format +msgid "" +"Value is an array with %d items:\n" +"\n" +msgstr "" + +#: ../xfconf-query/main.c:411 +#, c-format +msgid "" +"Property \"%s\" does not exist on channel \"%s\". If a new\n" +"property should be created, use the --create option.\n" +msgstr "" + +#: ../xfconf-query/main.c:419 +#, c-format +msgid "When creating a new property, the value type must be specified.\n" +msgstr "Pri stvaranju novoga svojstva tip vrijednosti mora biti određen.\n" + +#: ../xfconf-query/main.c:429 +#, c-format +msgid "Failed to get the existing type for the value.\n" +msgstr "Nije moguće odrediti tip vrijednosti.\n" + +#: ../xfconf-query/main.c:447 +#, c-format +msgid "Unable to determine the type of the value.\n" +msgstr "Nije moguće odrediti tip vrijednosti.\n" + +#: ../xfconf-query/main.c:453 +#, c-format +msgid "" +"A value type must be specified to change an array into a single value.\n" +msgstr "" + +#: ../xfconf-query/main.c:463 ../xfconf-query/main.c:525 +#, c-format +msgid "Unable to convert \"%s\" to type \"%s\"\n" +msgstr "Nije moguće pretvoriti \"%s\" u tip \"%s\"\n" + +#: ../xfconf-query/main.c:470 ../xfconf-query/main.c:540 +#, c-format +msgid "Failed to set property.\n" +msgstr "Neuspjelo postavljanje svojstva.\n" + +#: ../xfconf-query/main.c:495 +#, c-format +msgid "There are %d new values, but only %d types could be determined.\n" +msgstr "Postoje %d nove vrijednosti ali samo %d tipovi mogu biti određeni.\n" + +#: ../xfconf-query/main.c:516 +#, c-format +msgid "Unable to determine type of value at index %d.\n" +msgstr "Nije moguće odrediti tip vrijednosti u indeksu %d.\n" + +#: ../xfconf-query/main.c:567 +#, c-format +msgid "Channel '%s' contains no properties\n" +msgstr "Kanal \"%s\" ne sadržava svojstva\n" + +#: ../xfconf-query/main.c:583 ../xfconf-query/main.c:592 +#, c-format +msgid "Could not create export file \"%s\": %s\n" +msgstr "Ne mogu napraviti datoteku izvoza \"%s\": %s\n" + +#: ../xfconf-query/main.c:612 +#, c-format +msgid "Could not open import file \"%s\": %s\n" +msgstr "Ne mogu otvoriti datoteku uvoza \"%s\": %s\n" + +#: ../xfconf-query/main.c:621 +#, c-format +msgid "Could not parse import file \"%s\": %s\n" +msgstr "" + +#~ msgid "set" +#~ msgstr "postavi" + +#~ msgid "reset" +#~ msgstr "postavi ponovno" + +#~ msgid "The Xfce development team. All rights reserved." +#~ msgstr "Tim Xfce razvojni tim. Sva prava pridržana." + +#~ msgid "Please report bugs to <%s>." +#~ msgstr "Prijavite problema na <%s>." + +#~ msgid "Channels:" +#~ msgstr "Kanali:" + +#~ msgid "No property specified" +#~ msgstr "Nije određeno svojstvo" diff -Nru xfconf-4.8.0/po/is.po xfconf-4.8.1/po/is.po --- xfconf-4.8.0/po/is.po 1970-01-01 00:00:00.000000000 +0000 +++ xfconf-4.8.1/po/is.po 2011-12-23 16:05:11.000000000 +0000 @@ -0,0 +1,334 @@ +# translation of xfconf.xfce-4-8.untitled.po to Icelandic +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Sveinn í Felli , 2011. +msgid "" +msgstr "" +"Project-Id-Version: xfconf.xfce-4-8.untitled\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-06 07:42+0000\n" +"PO-Revision-Date: 2011-12-03 07:53+0000\n" +"Last-Translator: Sveinn í Felli \n" +"Language-Team: Icelandic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../xfconf/xfconf-cache.c:875 +#, c-format +msgid "Failed to make ResetProperty DBus call" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:277 +#, c-format +msgid "Unable to create configuration directory \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:322 +#: ../xfconfd/xfconf-daemon.c:238 +#, c-format +msgid "Permission denied while modifying property \"%s\" on channel \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:387 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:469 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:634 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:654 +#, c-format +msgid "Property \"%s\" does not exist on channel \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:601 +#, c-format +msgid "Unable to remove channel \"%s\": %s" +msgstr "Mistókst að fjarlægja rás \"%s\": %s" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1298 +#, c-format +msgid "Invalid type for : \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1314 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1390 +#, c-format +msgid "Unable to parse value of type \"%s\" from \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1370 +#, c-format +msgid "The type attribute of cannot be an array" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1379 +#, c-format +msgid "Invalid type for : \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1655 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1904 +#, c-format +msgid "Channel \"%s\" does not exist" +msgstr "Rás \"%s\" er ekki til" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1962 +#, c-format +msgid "Unable to write channel \"%s\": %s" +msgstr "Mistókst að skrifa inn rás \"%s\": %s" + +#: ../xfconfd/xfconf-backend-factory.c:76 +#, c-format +msgid "Unable to find Xfconf backend of type \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:103 +#, c-format +msgid "Property names must start with a '/' character" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:112 +#, c-format +msgid "The root element ('/') is not a valid property name" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:126 +#, c-format +msgid "" +"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', " +"'-', '<' and '>', as well as '/' as a separator" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:135 +#, c-format +msgid "Property names cannot have two or more consecutive '/' characters" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:146 +#, c-format +msgid "Property names cannot end with a '/' character" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:163 +#, c-format +msgid "Channel name cannot be an empty string" +msgstr "Nafn rásar getur ekki verið tómt" + +#: ../xfconfd/xfconf-backend.c:176 +#, c-format +msgid "" +"Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and " +"'-'" +msgstr "Nafn rása meiga aðeins hafa ASCII stafi A-Z, a - z, 0-9, '_', og '-'" + +#: ../xfconfd/xfconf-backend.c:398 +#, c-format +msgid "" +"The property name can only be empty or \"/\" if a recursive reset was " +"specified" +msgstr "" + +#: ../xfconfd/main.c:134 +msgid "Prints the xfconfd version." +msgstr "Prenta xfconfd útgáfuna." + +#: ../xfconfd/main.c:136 +msgid "" +"Configuration backends to use. The first backend specified is opened read/" +"write; the others, read-only." +msgstr "" + +#: ../xfconfd/main.c:139 +msgid "Fork into background after starting; only useful for testing purposes" +msgstr "" + +#: ../xfconfd/main.c:159 +msgid "Xfce Configuration Daemon" +msgstr "" + +#: ../xfconfd/main.c:165 +msgid "Xfce configuration daemon" +msgstr "" + +#: ../xfconfd/main.c:167 +msgid "Report bugs to http://bugs.xfce.org/\n" +msgstr "Tilkynna villu til http://bugs.xfce.org/\n" + +#: ../xfconfd/main.c:170 +#, c-format +msgid "Error parsing options: %s\n" +msgstr "" + +#: ../xfconfd/xfconf-daemon.c:482 +#, c-format +msgid "Another Xfconf daemon is already running" +msgstr "" + +#: ../xfconfd/xfconf-daemon.c:517 +#, c-format +msgid "No backends could be started" +msgstr "" + +#: ../xfconf-query/main.c:92 +#, c-format, fuzzy +msgid "Property '%s' changed: %s\n" +msgstr "Eiginleiknum '%s' breytt: %s\n" + +#: ../xfconf-query/main.c:97 +#, c-format, fuzzy +msgid "Property '%s' changed\n" +msgstr "Eiginleiknum '%s' breytt\n" + +#: ../xfconf-query/main.c:102 +#, c-format, fuzzy +msgid "Property '%s' removed\n" +msgstr "Eiginleikinn '%s' fjarlægður\n" + +#: ../xfconf-query/main.c:111 +#, c-format +msgid "Export method not yet implemented" +msgstr "" + +#: ../xfconf-query/main.c:125 +#, c-format +msgid "Export not yet implemented" +msgstr "" + +#: ../xfconf-query/main.c:191 +msgid "Version information" +msgstr "Útgáfuupplýsingar" + +#: ../xfconf-query/main.c:195 +msgid "The channel to query/modify" +msgstr "" + +#: ../xfconf-query/main.c:199 +msgid "The property to query/modify" +msgstr "" + +#: ../xfconf-query/main.c:203 +msgid "The new value to set for the property" +msgstr "" + +#: ../xfconf-query/main.c:207 +msgid "List properties (or channels if -c is not specified)" +msgstr "" + +#: ../xfconf-query/main.c:211 +msgid "Verbose output" +msgstr "" + +#: ../xfconf-query/main.c:215 +msgid "Create a new property if it does not already exist" +msgstr "" + +#: ../xfconf-query/main.c:219 +msgid "Specify the property value type" +msgstr "" + +#: ../xfconf-query/main.c:223 +msgid "Reset property" +msgstr "" + +#: ../xfconf-query/main.c:227 +msgid "Recursive (use with -r)" +msgstr "" + +#: ../xfconf-query/main.c:231 +msgid "Force array even if only one element" +msgstr "" + +#: ../xfconf-query/main.c:245 +msgid "Monitor a channel for property changes" +msgstr "" + +#: ../xfconf-query/main.c:349 +#, c-format +msgid "Start monitoring channel '%s':" +msgstr "Byrja eftirlit á rás '%s':" + +#: ../xfconf-query/main.c:371 +#, c-format +msgid "Property \"%s\" does not exist on channel \"%s\".\n" +msgstr "" + +#: ../xfconf-query/main.c:379 ../xfconf-query/main.c:397 +msgid "(unknown)" +msgstr "(óþekkt)" + +#: ../xfconf-query/main.c:388 +#, c-format +msgid "" +"Value is an array with %d items:\n" +"\n" +msgstr "" + +#: ../xfconf-query/main.c:411 +#, c-format +msgid "" +"Property \"%s\" does not exist on channel \"%s\". If a new\n" +"property should be created, use the --create option.\n" +msgstr "" + +#: ../xfconf-query/main.c:419 +#, c-format +msgid "When creating a new property, the value type must be specified.\n" +msgstr "" + +#: ../xfconf-query/main.c:429 +#, c-format +msgid "Failed to get the existing type for the value.\n" +msgstr "" + +#: ../xfconf-query/main.c:447 +#, c-format +msgid "Unable to determine the type of the value.\n" +msgstr "" + +#: ../xfconf-query/main.c:453 +#, c-format +msgid "" +"A value type must be specified to change an array into a single value.\n" +msgstr "" + +#: ../xfconf-query/main.c:463 ../xfconf-query/main.c:525 +#, c-format +msgid "Unable to convert \"%s\" to type \"%s\"\n" +msgstr "" + +#: ../xfconf-query/main.c:470 ../xfconf-query/main.c:540 +#, c-format +msgid "Failed to set property.\n" +msgstr "" + +#: ../xfconf-query/main.c:495 +#, c-format +msgid "There are %d new values, but only %d types could be determined.\n" +msgstr "" + +#: ../xfconf-query/main.c:516 +#, c-format +msgid "Unable to determine type of value at index %d.\n" +msgstr "" + +#: ../xfconf-query/main.c:567 +#, c-format +msgid "Channel '%s' contains no properties\n" +msgstr "Rásinn '%s' hefur enga eiginleika\n" + +#: ../xfconf-query/main.c:583 ../xfconf-query/main.c:592 +#, c-format +msgid "Could not create export file \"%s\": %s\n" +msgstr "" + +#: ../xfconf-query/main.c:612 +#, c-format +msgid "Could not open import file \"%s\": %s\n" +msgstr "" + +#: ../xfconf-query/main.c:621 +#, c-format +msgid "Could not parse import file \"%s\": %s\n" +msgstr "" diff -Nru xfconf-4.8.0/po/ko.po xfconf-4.8.1/po/ko.po --- xfconf-4.8.0/po/ko.po 1970-01-01 00:00:00.000000000 +0000 +++ xfconf-4.8.1/po/ko.po 2011-12-23 16:05:11.000000000 +0000 @@ -0,0 +1,346 @@ +# translation of xfconf to Hebrew +# Hebrew translations for xfconf package. +# Copyright (C) 2002-2010 The Xfce development team. +# This file is distributed under the same license as the xfconf package. +# Hezy Amiel , 2010. +msgid "" +msgstr "" +"Project-Id-Version: xfconf\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-09-12 10:39+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: Seong-ho, Cho \n" +"Language-Team: Korean \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: he\n" +"X-Poedit-Language: Korean\n" +"X-Poedit-Country: KOREA, REPUBLIC OF\n" + +#: ../xfconf/xfconf-cache.c:875 +#, c-format +msgid "Failed to make ResetProperty DBus call" +msgstr "ResetProperty DBus 콜을 만드는데 실패했습니다" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:277 +#, c-format +msgid "Unable to create configuration directory \"%s\"" +msgstr "환경설정 디렉터리 \"%s\"을(를) 만들 수 없습니다" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:322 +#: ../xfconfd/xfconf-daemon.c:238 +#, c-format +msgid "Permission denied while modifying property \"%s\" on channel \"%s\"" +msgstr "" +"프로퍼티 \"%s\"을(를) 채널 \"%s\"에서 수정하는 동안 권한이 거부되었습니다" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:387 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:469 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:634 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:654 +#, c-format +msgid "Property \"%s\" does not exist on channel \"%s\"" +msgstr "프로퍼티 \"%s\"은(는) 채널 \"%s\"에 존재하지 않습니다" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:601 +#, c-format +msgid "Unable to remove channel \"%s\": %s" +msgstr "채널 \"%s\"을(를) 제거할 수 없습니다: %s" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1298 +#, c-format +msgid "Invalid type for : \"%s\"" +msgstr "잘못된 유형입니다: \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1314 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1390 +#, c-format +msgid "Unable to parse value of type \"%s\" from \"%s\"" +msgstr "유형 \"%s\"의 값을 \"%s\"(으)로부터 해석할 수 없습니다" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1370 +#, c-format +msgid "The type attribute of cannot be an array" +msgstr "의 속성 유형은 배열이 될 수 없습니다" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1379 +#, c-format +msgid "Invalid type for : \"%s\"" +msgstr "잘못된 유형입니다: \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1655 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1904 +#, c-format +msgid "Channel \"%s\" does not exist" +msgstr "채널 \"%s\"이(가) 존재하지 않습니다" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1962 +#, c-format +msgid "Unable to write channel \"%s\": %s" +msgstr "채널 \"%s\"에 기록할 수 없습니다: %s" + +#: ../xfconfd/xfconf-backend-factory.c:76 +#, c-format +msgid "Unable to find Xfconf backend of type \"%s\"" +msgstr "유형 \"%s\"에 대한 Xfconf 백엔드를 찾을 수 없습니다" + +#: ../xfconfd/xfconf-backend.c:103 +#, c-format +msgid "Property names must start with a '/' character" +msgstr "프로퍼티 이름은 '/' 문자로 시작해야 합니다" + +#: ../xfconfd/xfconf-backend.c:112 +#, c-format +msgid "The root element ('/') is not a valid property name" +msgstr "루트 요소('/')는 올바른 프로퍼티 이름이 아닙니다" + +#: ../xfconfd/xfconf-backend.c:126 +#, c-format +msgid "" +"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', " +"'-', '<' and '>', as well as '/' as a separator" +msgstr "" +"프로퍼티 이름은 ASCII 문자 A-Z, a-z, 0-9, '_', '-', '<' 그리고 '>', '/' 와 같" +"은 구분기호만이 포함될 수 있습니다" + +#: ../xfconfd/xfconf-backend.c:135 +#, c-format +msgid "Property names cannot have two or more consecutive '/' characters" +msgstr "프로퍼티 이름은 둘 이상의 연속적인 '/' 문자를 가질 수 없습니다" + +#: ../xfconfd/xfconf-backend.c:146 +#, c-format +msgid "Property names cannot end with a '/' character" +msgstr "프로퍼티 이름은 '/' 문자로 끝날 수 없습니다" + +#: ../xfconfd/xfconf-backend.c:163 +#, c-format +msgid "Channel name cannot be an empty string" +msgstr "채널 이름은 빈 문자열이 될 수 없습니다" + +#: ../xfconfd/xfconf-backend.c:176 +#, c-format +msgid "" +"Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and " +"'-'" +msgstr "" +"채널 이름은 ASCII 문자 A-Z, a-z, 0-9, '_', 그리고 '-'만 포함될 수 있습니다" + +#: ../xfconfd/xfconf-backend.c:398 +#, c-format +msgid "" +"The property name can only be empty or \"/\" if a recursive reset was " +"specified" +msgstr "" +"프로퍼티 이름은 비거나 재귀적 리셋이 정의되었을 경우 \"/\"만 될 수 있습니다" + +#: ../xfconfd/main.c:134 +msgid "Prints the xfconfd version." +msgstr "xfconfd 버전을 출력합니다." + +#: ../xfconfd/main.c:136 +msgid "" +"Configuration backends to use. The first backend specified is opened read/" +"write; the others, read-only." +msgstr "" +"사용하기 위한 환경설정 백엔드입니다. 정의된 첫번째 백엔드는 읽기/쓰기로 열려 " +"있습니다. 이에 반해 다른 요소들은 읽기전용입니다." + +#: ../xfconfd/main.c:139 +msgid "Fork into background after starting; only useful for testing purposes" +msgstr "" +"시작한 후 백그라운드로 쪼갭니다. 이것은 시험 목적일 경우에만 유용합니다" + +#: ../xfconfd/main.c:159 +msgid "Xfce Configuration Daemon" +msgstr "Xfce 환경설정 데몬" + +#: ../xfconfd/main.c:165 +msgid "Xfce configuration daemon" +msgstr "Xfce 환경설정 데몬" + +#: ../xfconfd/main.c:167 +msgid "Report bugs to http://bugs.xfce.org/\n" +msgstr "http://bugs.xfce.org로 버그를 보고하여 주십시오\n" + +#: ../xfconfd/main.c:170 +#, c-format +msgid "Error parsing options: %s\n" +msgstr "옵션 해석 오류: %s\n" + +#: ../xfconfd/xfconf-daemon.c:482 +#, c-format +msgid "Another Xfconf daemon is already running" +msgstr "다른 Xfconf 데몬이 이미 실행중입니다" + +#: ../xfconfd/xfconf-daemon.c:517 +#, c-format +msgid "No backends could be started" +msgstr "어떤 백엔드도 시작될 수 없었습니다" + +#: ../xfconf-query/main.c:92 +#, c-format +msgid "Property '%s' changed: %s\n" +msgstr "프로퍼티 '%s'이(가) 바뀌었습니다: %s\n" + +#: ../xfconf-query/main.c:97 +#, c-format +msgid "Property '%s' changed\n" +msgstr "프로퍼티 '%s'이(가) 바뀌었습니다\n" + +#: ../xfconf-query/main.c:102 +#, c-format +msgid "Property '%s' removed\n" +msgstr "프로퍼티 '%s'이(가) 제거되었습니다\n" + +#: ../xfconf-query/main.c:111 +#, c-format +msgid "Export method not yet implemented" +msgstr "내보내기 동작이 아직 구현되지 않았습니다" + +#: ../xfconf-query/main.c:125 +#, c-format +msgid "Export not yet implemented" +msgstr "내보내기가 아직 구현되지 않았습니다" + +#: ../xfconf-query/main.c:191 +msgid "Version information" +msgstr "버전 정보" + +#: ../xfconf-query/main.c:195 +msgid "The channel to query/modify" +msgstr "요청/수정을 위한 채널" + +#: ../xfconf-query/main.c:199 +msgid "The property to query/modify" +msgstr "요청/수정을 위한 프로퍼티" + +#: ../xfconf-query/main.c:203 +msgid "The new value to set for the property" +msgstr "프로퍼티를 설정할 새 값" + +#: ../xfconf-query/main.c:207 +msgid "List properties (or channels if -c is not specified)" +msgstr "목록 프로퍼티 (또는 -c가 정의되었을 경우 채널)" + +#: ../xfconf-query/main.c:211 +msgid "Verbose output" +msgstr "상세 출력" + +#: ../xfconf-query/main.c:215 +msgid "Create a new property if it does not already exist" +msgstr "프로퍼티가 이미 존재하지 않는 경우 새로운 프로퍼티를 만들기" + +#: ../xfconf-query/main.c:219 +msgid "Specify the property value type" +msgstr "프로퍼티 값 유형을 정의" + +#: ../xfconf-query/main.c:223 +msgid "Reset property" +msgstr "프로퍼티 재설정" + +#: ../xfconf-query/main.c:227 +msgid "Recursive (use with -r)" +msgstr "재귀적 실행 (-r 과 함께 사용)" + +#: ../xfconf-query/main.c:231 +msgid "Force array even if only one element" +msgstr "단 한 가지의 요소만 있을 경우 배열로 강제" + +#: ../xfconf-query/main.c:245 +msgid "Monitor a channel for property changes" +msgstr "프로퍼티를 바꾸기 위한 채널 감시" + +#: ../xfconf-query/main.c:349 +#, c-format +msgid "Start monitoring channel '%s':" +msgstr "채널 '%s' 감시 시작:" + +#: ../xfconf-query/main.c:371 +#, c-format +msgid "Property \"%s\" does not exist on channel \"%s\".\n" +msgstr "프로퍼티 \"%s\"이(가) 채널 \"%s\"에 존재하지 않습니다.\n" + +#: ../xfconf-query/main.c:379 ../xfconf-query/main.c:397 +msgid "(unknown)" +msgstr "(알 수 없음)" + +#: ../xfconf-query/main.c:388 +#, c-format +msgid "" +"Value is an array with %d items:\n" +"\n" +msgstr "" +"값은 %d개의 항목을 가진 배열입니다:\n" +"\n" + +#: ../xfconf-query/main.c:411 +#, c-format +msgid "" +"Property \"%s\" does not exist on channel \"%s\". If a new\n" +"property should be created, use the --create option.\n" +msgstr "" +"프로퍼티 \"%s\"은(는) 채널 \"%s\"에 존재하지 않습니다. 만약 새로운\n" +"프로퍼티를 만들어야 한다면 --create 옵션을 사용하십시오.\n" + +#: ../xfconf-query/main.c:419 +#, c-format +msgid "When creating a new property, the value type must be specified.\n" +msgstr "새로운 프로퍼티를 생성할때, 값 유형이 정의되어야 합니다.\n" + +#: ../xfconf-query/main.c:429 +#, c-format +msgid "Failed to get the existing type for the value.\n" +msgstr "값의 존재하는 유형을 가져오는데 실패했습니다.\n" + +#: ../xfconf-query/main.c:447 +#, c-format +msgid "Unable to determine the type of the value.\n" +msgstr "값의 유형을 결정할 수 없습니다.\n" + +#: ../xfconf-query/main.c:453 +#, c-format +msgid "" +"A value type must be specified to change an array into a single value.\n" +msgstr "값의 유형은 배열로부터 단일 값으로 바꾸기 위해 정의되어야 합니다.\n" + +#: ../xfconf-query/main.c:463 ../xfconf-query/main.c:525 +#, c-format +msgid "Unable to convert \"%s\" to type \"%s\"\n" +msgstr "\"%s\"을(를) 유형 \"%s\"(으)로 변경할 수 없습니다\n" + +#: ../xfconf-query/main.c:470 ../xfconf-query/main.c:540 +#, c-format +msgid "Failed to set property.\n" +msgstr "프로퍼티를 설정하는데 실패했습니다.\n" + +#: ../xfconf-query/main.c:495 +#, c-format +msgid "There are %d new values, but only %d types could be determined.\n" +msgstr "%d개의 새로운 값들이 있지만, %d 유형으로만 결정될 수 있었습니다.\n" + +#: ../xfconf-query/main.c:516 +#, c-format +msgid "Unable to determine type of value at index %d.\n" +msgstr "인덱스 %d번의 값의 유형을 결정할 수 없습니다.\n" + +#: ../xfconf-query/main.c:567 +#, c-format +msgid "Channel '%s' contains no properties\n" +msgstr "채널 '%s'에 어떠한 프로퍼티도 포함되지 않았습니다\n" + +#: ../xfconf-query/main.c:583 ../xfconf-query/main.c:592 +#, c-format +msgid "Could not create export file \"%s\": %s\n" +msgstr "내보내는 파일 \"%s\"을(를) 만들 수 없습니다: %s\n" + +#: ../xfconf-query/main.c:612 +#, c-format +msgid "Could not open import file \"%s\": %s\n" +msgstr "가져오는 파일 \"%s\"을(를) 열 수 없습니다: %s\n" + +#: ../xfconf-query/main.c:621 +#, c-format +msgid "Could not parse import file \"%s\": %s\n" +msgstr "가져오는 파일 \"%s\"을(를) 해석할 수 없습니다: %s\n" diff -Nru xfconf-4.8.0/po/ms.po xfconf-4.8.1/po/ms.po --- xfconf-4.8.0/po/ms.po 1970-01-01 00:00:00.000000000 +0000 +++ xfconf-4.8.1/po/ms.po 2011-12-23 16:05:11.000000000 +0000 @@ -0,0 +1,350 @@ +# # # # Malay translation of the xfconf package. +# # # # Copyright (C) YEAR THE xfconf COPYRIGHT HOLDER +# # # # This file is distributed under the same license as the xfconf package. +# Puretech , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: xfconf\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-11-19 06:44+0000\n" +"PO-Revision-Date: 2011-11-19 19:59+0800\n" +"Last-Translator: Puretech \n" +"Language-Team: Malay <>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: ../xfconf/xfconf-cache.c:875 +#, c-format +msgid "Failed to make ResetProperty DBus call" +msgstr "Gagal membuat panggilan ResetProperty DBus " + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:277 +#, c-format +msgid "Unable to create configuration directory \"%s\"" +msgstr "Tak dapat mencipta direktori konfigurasi \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:322 +#: ../xfconfd/xfconf-daemon.c:238 +#, c-format +msgid "Permission denied while modifying property \"%s\" on channel \"%s\"" +msgstr "" +"Keizinan dinafikan semasa mengubah suai sifat \"%s\" pada saluran \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:387 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:469 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:634 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:654 +#, c-format +msgid "Property \"%s\" does not exist on channel \"%s\"" +msgstr "Sifat \"%s\" tidak terdapat pada saluran \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:601 +#, c-format +msgid "Unable to remove channel \"%s\": %s" +msgstr "Tidak dapat membuang saluran \"%s\": %s" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1298 +#, c-format +msgid "Invalid type for : \"%s\"" +msgstr "Jenis tidak sah untuk : \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1314 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1390 +#, c-format +msgid "Unable to parse value of type \"%s\" from \"%s\"" +msgstr "Tidak dapat menghuraikan nilai bagi jenis \"%s\" dari \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1370 +#, c-format +msgid "The type attribute of cannot be an array" +msgstr "Atribut jenis tidak boleh menjadi tatasusunan" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1379 +#, c-format +msgid "Invalid type for : \"%s\"" +msgstr "Jenis tidak sah untuk : \"%s\"" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1655 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1904 +#, c-format +msgid "Channel \"%s\" does not exist" +msgstr "Saluran \"%s\" tidak wujud" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1962 +#, c-format +msgid "Unable to write channel \"%s\": %s" +msgstr "Tidak dapat menulis saluran \"%s\": %s" + +#: ../xfconfd/xfconf-backend-factory.c:76 +#, c-format +msgid "Unable to find Xfconf backend of type \"%s\"" +msgstr "Tidak menjumpai Xfconf bahagian belakang dari jenis \"%s\"" + +#: ../xfconfd/xfconf-backend.c:103 +#, c-format +msgid "Property names must start with a '/' character" +msgstr "Nama sifat mesti bermula dengan aksara '/'" + +#: ../xfconfd/xfconf-backend.c:112 +#, c-format +msgid "The root element ('/') is not a valid property name" +msgstr "Elemen root ('/') bukan nama sifat yang sah" + +#: ../xfconfd/xfconf-backend.c:126 +#, c-format +msgid "" +"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', " +"'-', '<' and '>', as well as '/' as a separator" +msgstr "" +"Nama sifat hanya boleh dimasukkan aksara ASCII A-Z, a-z, 0-9, '_', '-', '<' " +"and '>', termasuk juga '/' sebagai jarak" + +#: ../xfconfd/xfconf-backend.c:135 +#, c-format +msgid "Property names cannot have two or more consecutive '/' characters" +msgstr "" +"Nama sifat tidak boleh mempunyai dua atau lebih berturut-turut aksara '/'" + +#: ../xfconfd/xfconf-backend.c:146 +#, c-format +msgid "Property names cannot end with a '/' character" +msgstr "Nama sifat tidak boleh berakhir dengan aksara '/'" + +#: ../xfconfd/xfconf-backend.c:163 +#, c-format +msgid "Channel name cannot be an empty string" +msgstr "Nama saluran tidak boleh sebagai rentetan kosong" + +#: ../xfconfd/xfconf-backend.c:176 +#, c-format +msgid "" +"Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and " +"'-'" +msgstr "" +"Nama saluran hanya boleh dimasukkan aksara ASCII A-Z, a-z, 0-9, '_', and '-'" + +#: ../xfconfd/xfconf-backend.c:398 +#, c-format +msgid "" +"The property name can only be empty or \"/\" if a recursive reset was " +"specified" +msgstr "" +"Nama sifat hanya boleh menjadi kosong atau \"/\" jika rekursif set semula " +"dinyatakan" + +#: ../xfconfd/main.c:134 +msgid "Prints the xfconfd version." +msgstr "Cetak versi xfconfd" + +#: ../xfconfd/main.c:136 +msgid "" +"Configuration backends to use. The first backend specified is opened read/" +"write; the others, read-only." +msgstr "" +"Konfigurasi bahagian belakang untuk digunakan. bahagian belakang pertama " +"yang dinyatakan dibuka baca/tulis; yang lain, baca sahaja." + +#: ../xfconfd/main.c:139 +msgid "Fork into background after starting; only useful for testing purposes" +msgstr "" +"Cabang ke latar belakang selepas bermula; hanya berguna untuk tujuan ujian" + +#: ../xfconfd/main.c:159 +msgid "Xfce Configuration Daemon" +msgstr "Konfigurasi Daemon Xfce" + +#: ../xfconfd/main.c:165 +msgid "Xfce configuration daemon" +msgstr "Konfigurasi daemon Xfce" + +#: ../xfconfd/main.c:167 +msgid "Report bugs to http://bugs.xfce.org/\n" +msgstr "Laporkan pepijat ke http://bugs.xfce.org/\n" + +#: ../xfconfd/main.c:170 +#, c-format +msgid "Error parsing options: %s\n" +msgstr "Ralat penghuraian pilihan: %s\n" + +#: ../xfconfd/xfconf-daemon.c:482 +#, c-format +msgid "Another Xfconf daemon is already running" +msgstr "Daemon Xfconf lain sudah berjalan" + +#: ../xfconfd/xfconf-daemon.c:517 +#, c-format +msgid "No backends could be started" +msgstr "Tiada bahagian belakang boleh dimulakan" + +#: ../xfconf-query/main.c:92 +#, c-format +msgid "Property '%s' changed: %s\n" +msgstr "Sifat '%s' bertukar: %s\n" + +#: ../xfconf-query/main.c:97 +#, c-format +msgid "Property '%s' changed\n" +msgstr "Sifat '%s' bertukar\n" + +#: ../xfconf-query/main.c:102 +#, c-format +msgid "Property '%s' removed\n" +msgstr "Sifat '%s' dibuang\n" + +#: ../xfconf-query/main.c:111 +#, c-format +msgid "Export method not yet implemented" +msgstr "Kaedah eksport masih belum diimplementasikan" + +#: ../xfconf-query/main.c:125 +#, c-format +msgid "Export not yet implemented" +msgstr "Eksport masih belum diimplementasikan" + +#: ../xfconf-query/main.c:191 +msgid "Version information" +msgstr "Maklumat versi" + +#: ../xfconf-query/main.c:195 +msgid "The channel to query/modify" +msgstr "Saluran untuk diminta/ubah suai" + +#: ../xfconf-query/main.c:199 +msgid "The property to query/modify" +msgstr "Sifat untuk diminta/ubah suai" + +#: ../xfconf-query/main.c:203 +msgid "The new value to set for the property" +msgstr "Nilai baharu untuk ditetapkan bagi sifat" + +#: ../xfconf-query/main.c:207 +msgid "List properties (or channels if -c is not specified)" +msgstr "Senarai ciri-ciri (atau saluran jika -c tidak dinyatakan)" + +#: ../xfconf-query/main.c:211 +msgid "Verbose output" +msgstr "Output panjang" + +#: ../xfconf-query/main.c:215 +msgid "Create a new property if it does not already exist" +msgstr "Cipta sifat baharu jika masih belum ada" + +#: ../xfconf-query/main.c:219 +msgid "Specify the property value type" +msgstr "Nyatakan jenis nilai sifat" + +#: ../xfconf-query/main.c:223 +msgid "Reset property" +msgstr "Set semula sifat" + +#: ../xfconf-query/main.c:227 +msgid "Recursive (use with -r)" +msgstr "Berturut-turut (guna dengan -r)" + +#: ../xfconf-query/main.c:231 +msgid "Force array even if only one element" +msgstr "Paksa tatasusunan walaupun jika hanya satu elemen" + +#: ../xfconf-query/main.c:245 +msgid "Monitor a channel for property changes" +msgstr "Pantau saluran untuk perubahan sifat" + +#: ../xfconf-query/main.c:349 +#, c-format +msgid "Start monitoring channel '%s':" +msgstr "Mula memantau saluran '%s':" + +#: ../xfconf-query/main.c:371 +#, c-format +msgid "Property \"%s\" does not exist on channel \"%s\".\n" +msgstr "Sifat \"%s\" tidak wujud pada saluran \"%s\".\n" + +#: ../xfconf-query/main.c:379 ../xfconf-query/main.c:397 +msgid "(unknown)" +msgstr "(tidak diketahui)" + +#: ../xfconf-query/main.c:388 +#, c-format +msgid "" +"Value is an array with %d items:\n" +"\n" +msgstr "" +"Nilai adalah tatasusunan dengan %d item:\n" +"\n" + +#: ../xfconf-query/main.c:411 +#, c-format +msgid "" +"Property \"%s\" does not exist on channel \"%s\". If a new\n" +"property should be created, use the --create option.\n" +msgstr "" +"Sifat \"%s\" tidak wujud pada saluran \"%s\". Jika sifat\n" +"baharu perlu dicipta, gunakan --create option.\n" + +#: ../xfconf-query/main.c:419 +#, c-format +msgid "When creating a new property, the value type must be specified.\n" +msgstr "Apabila mewujudkan sifat baharu, jenis nilai perlu dinyatakan.\n" + +#: ../xfconf-query/main.c:429 +#, c-format +msgid "Failed to get the existing type for the value.\n" +msgstr "Gagal untuk mendapatkan jenis sedia ada untuk nilai.\n" + +#: ../xfconf-query/main.c:447 +#, c-format +msgid "Unable to determine the type of the value.\n" +msgstr "Tidak dapat menentukan jenis nilai\n" + +#: ../xfconf-query/main.c:453 +#, c-format +msgid "" +"A value type must be specified to change an array into a single value.\n" +msgstr "" +"Jenis nilai mesti dinyatakan untuk menukar tatasusunan ke dalam nilai " +"tunggal.\n" + +#: ../xfconf-query/main.c:463 ../xfconf-query/main.c:525 +#, c-format +msgid "Unable to convert \"%s\" to type \"%s\"\n" +msgstr "Tidak dapat menukar \"%s\" ke jenis \"%s\"\n" + +#: ../xfconf-query/main.c:470 ../xfconf-query/main.c:540 +#, c-format +msgid "Failed to set property.\n" +msgstr "Gagal menetapkan sifat.\n" + +#: ../xfconf-query/main.c:495 +#, c-format +msgid "There are %d new values, but only %d types could be determined.\n" +msgstr "" +"Terdapat %d nilai baharu, tetapi hanya %d jenis yang boleh ditentukan \n" + +#: ../xfconf-query/main.c:516 +#, c-format +msgid "Unable to determine type of value at index %d.\n" +msgstr "Tidak dapat menentukan jenis nilai pada indeks %d.\n" + +#: ../xfconf-query/main.c:567 +#, c-format +msgid "Channel '%s' contains no properties\n" +msgstr "Saluran '%s' tidak mengandungi ciri-ciri\n" + +#: ../xfconf-query/main.c:583 ../xfconf-query/main.c:592 +#, c-format +msgid "Could not create export file \"%s\": %s\n" +msgstr "Tidak dapat mencipta fail eksport \"%s\": %s\n" + +#: ../xfconf-query/main.c:612 +#, c-format +msgid "Could not open import file \"%s\": %s\n" +msgstr "Tidak dapat membuka fail import \"%s\": %s\n" + +#: ../xfconf-query/main.c:621 +#, c-format +msgid "Could not parse import file \"%s\": %s\n" +msgstr "Tidak dapat menghuraikan fail import \"%s\": %s\n" diff -Nru xfconf-4.8.0/po/nl.po xfconf-4.8.1/po/nl.po --- xfconf-4.8.0/po/nl.po 2011-01-16 14:52:08.000000000 +0000 +++ xfconf-4.8.1/po/nl.po 2011-12-23 16:05:11.000000000 +0000 @@ -1,38 +1,39 @@ -# Dutch translations for xfconf package. -# Copyright (C) 2009 THE xfconf'S COPYRIGHT HOLDER +# Dutch translation for the xfconf package. +# Copyright (C) The Xfce development team. # This file is distributed under the same license as the xfconf package. # Stephan Arts , 2009. -# +# Pjotr, 2011. +# msgid "" msgstr "" -"Project-Id-Version: xfconf 4.5.92svn-r28734\n" +"Project-Id-Version: xfconf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 15:52+0100\n" -"PO-Revision-Date: 2009-01-24 16:20+0100\n" -"Last-Translator: Vincent Tunru \n" -"Language-Team: Dutch\n" -"Language: \n" +"POT-Creation-Date: 2011-09-07 16:39+0000\n" +"PO-Revision-Date: 2011-09-07 16:20+0200\n" +"Last-Translator: Pjotr\n" +"Language-Team: Dutch (Flemish)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl (Dutch)\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../xfconf/xfconf-cache.c:875 #, c-format msgid "Failed to make ResetProperty DBus call" -msgstr "Mislukt ResetProperty DBus call te maken" +msgstr "Kon geen ResetProperty DBus call maken" #: ../xfconfd/xfconf-backend-perchannel-xml.c:277 #, c-format msgid "Unable to create configuration directory \"%s\"" -msgstr "De configuratiemap \"%s\" kon niet gemaakt worden" +msgstr "Kon de configuratiemap \"%s\" niet maken" #: ../xfconfd/xfconf-backend-perchannel-xml.c:322 #: ../xfconfd/xfconf-daemon.c:238 #, c-format msgid "Permission denied while modifying property \"%s\" on channel \"%s\"" msgstr "" -"Onvoldoende rechten voor het bewerken van instelling \"%s\" op kanaal \"%s\"" +"Onvoldoende rechten voor het bewerken van eigenschap \"%s\" op kanaal \"%s\"" #: ../xfconfd/xfconf-backend-perchannel-xml.c:387 #: ../xfconfd/xfconf-backend-perchannel-xml.c:469 @@ -40,12 +41,12 @@ #: ../xfconfd/xfconf-backend-perchannel-xml.c:654 #, c-format msgid "Property \"%s\" does not exist on channel \"%s\"" -msgstr "Instelling \"%s\" bestaat niet in kanaal \"%s\"" +msgstr "Eigenschap \"%s\" bestaat niet op kanaal \"%s\"" #: ../xfconfd/xfconf-backend-perchannel-xml.c:601 #, c-format msgid "Unable to remove channel \"%s\": %s" -msgstr "Kanaal \"%s\" kan niet verwijderd worden: %s" +msgstr "Kon kanaal \"%s\" niet verwijderen: %s" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1298 #, c-format @@ -61,7 +62,7 @@ #: ../xfconfd/xfconf-backend-perchannel-xml.c:1370 #, c-format msgid "The type attribute of cannot be an array" -msgstr "De type-instelling van kan geen array zijn" +msgstr "De type-instelling van kan geen reeks zijn" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1379 #, c-format @@ -77,22 +78,22 @@ #: ../xfconfd/xfconf-backend-perchannel-xml.c:1962 #, c-format msgid "Unable to write channel \"%s\": %s" -msgstr "Er kan niet worden geschreven naar kanaal \"%s\": %s" +msgstr "Kon kanaal \"%s\" niet schrijven: %s" #: ../xfconfd/xfconf-backend-factory.c:76 #, c-format msgid "Unable to find Xfconf backend of type \"%s\"" -msgstr "Er kan geen Xfconf backend gevonden worden van het type \"%s\"" +msgstr "Kon geen Xfconf-dienst vinden van het type \"%s\"" #: ../xfconfd/xfconf-backend.c:103 #, c-format msgid "Property names must start with a '/' character" -msgstr "Instellingsnamen moeten beginnen met een '/' symbool" +msgstr "Eigenschapnamen moeten beginnen met een '/' teken" #: ../xfconfd/xfconf-backend.c:112 #, c-format msgid "The root element ('/') is not a valid property name" -msgstr "Het hoofdonderdeel ('/') is geen geldige instellingsnaam" +msgstr "Het root-element ('/') is geen geldige eigenschapnaam" #: ../xfconfd/xfconf-backend.c:126 #, c-format @@ -100,24 +101,24 @@ "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', " "'-', '<' and '>', as well as '/' as a separator" msgstr "" -"Instellingsnamen kunnen alleen de ASCII karakters A-Z, a-z, 0-9, '_', '-', " -"'<' en '>', en het scheidingsteken '/' bevatten" +"Eigenschapnamen kunnen alleen de ASCII tekens A-Z, a-z, 0-9, '_', '-', '<' " +"en '>', en het scheidingsteken '/' bevatten" #: ../xfconfd/xfconf-backend.c:135 #, c-format msgid "Property names cannot have two or more consecutive '/' characters" msgstr "" -"Instellingsnamen kunnen niet meerdere opeenvolgende '/' symbolen bevatten" +"Eigenschapnamen kunnen niet twee of meer opeenvolgende '/' tekens bevatten" #: ../xfconfd/xfconf-backend.c:146 #, c-format msgid "Property names cannot end with a '/' character" -msgstr "Instellingsnamen kunnen niet eindigen met een '/' symbool" +msgstr "Eigenschapnamen kunnen niet eindigen met een '/' teken" #: ../xfconfd/xfconf-backend.c:163 #, c-format msgid "Channel name cannot be an empty string" -msgstr "Kanaalnaam kan geen lege string zijn" +msgstr "Kanaalnaam kan geen leeg tekstsnoer zijn" #: ../xfconfd/xfconf-backend.c:176 #, c-format @@ -125,8 +126,7 @@ "Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and " "'-'" msgstr "" -"Kanaalnamen kunnen alleen de ASCII karakters A-Z, a-z, 0-9, '_', en '-' " -"bevatten" +"Kanaalnamen kunnen alleen de ASCII-tekens A-Z, a-z, 0-9, '_', en '-' bevatten" #: ../xfconfd/xfconf-backend.c:398 #, c-format @@ -134,31 +134,33 @@ "The property name can only be empty or \"/\" if a recursive reset was " "specified" msgstr "" -"De instellingsnaam kan alleen \"/\" of leeg zijn wanneer er een recursieve " -"reset wordt uitgevoerd" +"De eigenschapnaam kan alleen leeg of \"/\" zijn, als er een recursieve " +"terugbrenging naar de standaardinstellingen werd gespecificeerd" #: ../xfconfd/main.c:134 msgid "Prints the xfconfd version." -msgstr "Toont de xfconfd versie." +msgstr "Drukt de versie van xfconfd af." #: ../xfconfd/main.c:136 msgid "" "Configuration backends to use. The first backend specified is opened read/" "write; the others, read-only." msgstr "" +"Configuratiediensten die u kunt gebruiken. De eerst opgegeven dienst wordt " +"lezen/schrijven geopend; de andere, alleen-lezen." #: ../xfconfd/main.c:139 msgid "Fork into background after starting; only useful for testing purposes" msgstr "" -"Plaats in de achtergrond na de start, alleen nuttig voor testdoeleinden" +"Vork in de achtergrond na het starten, alleen nuttig voor proefdoeleinden" #: ../xfconfd/main.c:159 msgid "Xfce Configuration Daemon" -msgstr "Xfce Configuratiedaemon" +msgstr "Achtergronddienst van Xfce Configuratie" #: ../xfconfd/main.c:165 msgid "Xfce configuration daemon" -msgstr "Xfce configuratiedaemon" +msgstr "Achtergronddienst van Xfce-configuratie" #: ../xfconfd/main.c:167 msgid "Report bugs to http://bugs.xfce.org/\n" @@ -167,42 +169,42 @@ #: ../xfconfd/main.c:170 #, c-format msgid "Error parsing options: %s\n" -msgstr "Kon de opties niet verwerken: %s\n" +msgstr "Kon de opties niet lezen: %s\n" #: ../xfconfd/xfconf-daemon.c:482 #, c-format msgid "Another Xfconf daemon is already running" -msgstr "Een andere Xfconf-daemon is al actief" +msgstr "Een andere Xfconf-achtergronddienst is al actief" #: ../xfconfd/xfconf-daemon.c:517 #, c-format msgid "No backends could be started" -msgstr "" +msgstr "Geen configuratiediensten konden worden gestart." #: ../xfconf-query/main.c:92 #, c-format msgid "Property '%s' changed: %s\n" -msgstr "Instelling '%s' is gewijzigd: %s\n" +msgstr "Eigenschap '%s' gewijzigd: %s\n" #: ../xfconf-query/main.c:97 #, c-format msgid "Property '%s' changed\n" -msgstr "Instelling '%s' is gewijzigd\n" +msgstr "Eigenschap '%s' gewijzigd\n" #: ../xfconf-query/main.c:102 #, c-format msgid "Property '%s' removed\n" -msgstr "Instelling '%s' is verwijderd\n" +msgstr "Eigenschap '%s' verwijderd\n" #: ../xfconf-query/main.c:111 #, c-format msgid "Export method not yet implemented" -msgstr "De exporteer-functie is nog niet geïmplementeerd" +msgstr "Uitvoermethode nog niet geïmplementeerd" #: ../xfconf-query/main.c:125 #, c-format msgid "Export not yet implemented" -msgstr "Exporteren is nog niet geïmplementeerd" +msgstr "Uitvoeren nog niet geïmplementeerd" #: ../xfconf-query/main.c:191 msgid "Version information" @@ -210,20 +212,21 @@ #: ../xfconf-query/main.c:195 msgid "The channel to query/modify" -msgstr "Het kanaal om raad te plegen/te bewerken" +msgstr "Het kanaal om te doorzoeken/bewerken" #: ../xfconf-query/main.c:199 msgid "The property to query/modify" -msgstr "De instelling om te raadplegen/bewerken" +msgstr "De eigenschap om te doorzoeken/bewerken" #: ../xfconf-query/main.c:203 msgid "The new value to set for the property" -msgstr "Nieuwe waarde voor de instelling" +msgstr "De nieuwe waarde om in te stellen voor de eigenschap" #: ../xfconf-query/main.c:207 msgid "List properties (or channels if -c is not specified)" msgstr "" -"Geef een lijst van instellingen (of kanalen wanneer -c niet is meegegeven)" +"Geef een lijst van eigenschappen (of kanalen wanneer -c niet is " +"gespecificeerd)" #: ../xfconf-query/main.c:211 msgid "Verbose output" @@ -231,15 +234,15 @@ #: ../xfconf-query/main.c:215 msgid "Create a new property if it does not already exist" -msgstr "Maak een nieuwe instelling wanneer deze nog niet bestaat" +msgstr "Maak een nieuwe eigenschap wanneer deze nog niet bestaat" #: ../xfconf-query/main.c:219 msgid "Specify the property value type" -msgstr "Specificeer het type van de instelling" +msgstr "Specificeer het waardetype van de eigenschap" #: ../xfconf-query/main.c:223 msgid "Reset property" -msgstr "Instelling beginwaarde geven" +msgstr "Eigenschap standaardwaarde geven" #: ../xfconf-query/main.c:227 msgid "Recursive (use with -r)" @@ -251,17 +254,17 @@ #: ../xfconf-query/main.c:245 msgid "Monitor a channel for property changes" -msgstr "Monitor een kanaal voor eigenschap veranderingen" +msgstr "Bewaak een kanaal voor eigenschapveranderingen" #: ../xfconf-query/main.c:349 #, c-format msgid "Start monitoring channel '%s':" -msgstr "Start controle kanaal '%s':" +msgstr "Start bewakingskanaal '%s':" #: ../xfconf-query/main.c:371 #, c-format msgid "Property \"%s\" does not exist on channel \"%s\".\n" -msgstr "Instelling \"%s\" bestaat niet voor kanaal \"%s\".\n" +msgstr "Eigenschap \"%s\" bestaat niet voor kanaal \"%s\".\n" #: ../xfconf-query/main.c:379 ../xfconf-query/main.c:397 msgid "(unknown)" @@ -282,13 +285,15 @@ "Property \"%s\" does not exist on channel \"%s\". If a new\n" "property should be created, use the --create option.\n" msgstr "" -"Instelling \"%s\" bestaat niet in kanaal \"%s\". Gebruik de\n" -"--create optie wanneer u deze instelling wilt aanmaken.\n" +"Eigenschap \"%s\" bestaat niet in kanaal \"%s\". Gebruik de\n" +"--create optie wanneer u deze eigenschap wil aanmaken.\n" #: ../xfconf-query/main.c:419 #, c-format msgid "When creating a new property, the value type must be specified.\n" -msgstr "Wanneer een instelling wordt gemaakt dient u het type op te geven.\n" +msgstr "" +"Wanneer een nieuwe eigenschap wordt gemaakt, dient u het waardetype op te " +"geven.\n" #: ../xfconf-query/main.c:429 #, c-format @@ -305,18 +310,18 @@ msgid "" "A value type must be specified to change an array into a single value.\n" msgstr "" -"Een waardetype moet worden ingesteld om een reeks te converteren naar een " +"Een waardetype moet worden ingesteld om een reeks te veranderen in een " "enkele waarde.\n" #: ../xfconf-query/main.c:463 ../xfconf-query/main.c:525 #, c-format msgid "Unable to convert \"%s\" to type \"%s\"\n" -msgstr "\"%s\" kon niet worden omgezet naar type \"%s\"\n" +msgstr "Kon \"%s\" niet omzetten naar type \"%s\"\n" #: ../xfconf-query/main.c:470 ../xfconf-query/main.c:540 #, c-format msgid "Failed to set property.\n" -msgstr "De instelling kon niet worden opgeslagen.\n" +msgstr "Kon de eigenschap niet instellen.\n" #: ../xfconf-query/main.c:495 #, c-format @@ -332,31 +337,31 @@ #: ../xfconf-query/main.c:567 #, c-format msgid "Channel '%s' contains no properties\n" -msgstr "Kanaal '%s' bevat geen instellingen\n" +msgstr "Kanaal '%s' bevat geen eigenschappen\n" #: ../xfconf-query/main.c:583 ../xfconf-query/main.c:592 #, c-format msgid "Could not create export file \"%s\": %s\n" -msgstr "Het exportbestand \"%s\" kon niet gemaakt worden: %s\n" +msgstr "Kon het uitvoerbestand \"%s\" niet maken: %s\n" #: ../xfconf-query/main.c:612 #, c-format msgid "Could not open import file \"%s\": %s\n" -msgstr "Het importbestand \"%s\" kon niet geopend worden: %s\n" +msgstr "Kon het invoerbestand \"%s\" niet openen: %s\n" #: ../xfconf-query/main.c:621 #, c-format msgid "Could not parse import file \"%s\": %s\n" -msgstr "Het importbestand \"%s\" kon niet gelezen worden: %s\n" +msgstr "Kon het invoerbestand \"%s\" niet lezen: %s\n" #~ msgid "Export channel to file" -#~ msgstr "Kanaal naar bestand exporteren" +#~ msgstr "Kanaal naar bestand uitvoeren" #~ msgid "Import channel from file" -#~ msgstr "Kanaal uit bestand importeren" +#~ msgstr "Kanaal vanuit bestand invoeren" #~ msgid "true" -#~ msgstr "true" +#~ msgstr "waar" #~ msgid "false" -#~ msgstr "false" +#~ msgstr "onwaar" diff -Nru xfconf-4.8.0/po/ru.po xfconf-4.8.1/po/ru.po --- xfconf-4.8.0/po/ru.po 2011-01-16 14:52:08.000000000 +0000 +++ xfconf-4.8.1/po/ru.po 2011-12-23 16:05:11.000000000 +0000 @@ -1,38 +1,39 @@ -# Russian translation of xfconf. -# Copyright (C) 2009 Ilya Shestopalov +# Russian translations for xfconf package. +# Copyright (C) 2009-2011 The Xfce development team. # This file is distributed under the same license as the xfconf package. -# Ilya , 2009. -# +# Ilya Shestopalov , 2009. +# Denis Koryavov , 2010. +# Artem Zolochevskiy , 2011. +# msgid "" msgstr "" -"Project-Id-Version: xfconf\n" +"Project-Id-Version: xfconf 4.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 15:52+0100\n" -"PO-Revision-Date: 2009-01-31 12:57+0300\n" -"Last-Translator: Ilya Shestopalov \n" +"POT-Creation-Date: 2011-08-26 10:40+0000\n" +"PO-Revision-Date: 2011-07-20 10:51+0300\n" +"Last-Translator: Artem Zolochevskiy \n" "Language-Team: Russian\n" -"Language: \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" +"Language: ru\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" #: ../xfconf/xfconf-cache.c:875 #, c-format msgid "Failed to make ResetProperty DBus call" -msgstr "Не удалось удалить свойство через DBus" +msgstr "Не удалось выполнить ResetProperty через DBus" #: ../xfconfd/xfconf-backend-perchannel-xml.c:277 #, c-format msgid "Unable to create configuration directory \"%s\"" -msgstr "Не удалось создать директорию конфигурации \"%s\"" +msgstr "Не удалось создать директорию конфигурации «%s»" #: ../xfconfd/xfconf-backend-perchannel-xml.c:322 #: ../xfconfd/xfconf-daemon.c:238 #, c-format msgid "Permission denied while modifying property \"%s\" on channel \"%s\"" -msgstr "Недостаточно прав для изменения свойств \"%s\" на канале \"%s\"" +msgstr "Недостаточно прав для изменения свойства «%s» на канале «%s»" #: ../xfconfd/xfconf-backend-perchannel-xml.c:387 #: ../xfconfd/xfconf-backend-perchannel-xml.c:469 @@ -40,23 +41,23 @@ #: ../xfconfd/xfconf-backend-perchannel-xml.c:654 #, c-format msgid "Property \"%s\" does not exist on channel \"%s\"" -msgstr "Свойство \"%s\" отсутствует на канале \"%s\"" +msgstr "Свойство «%s» отсутствует на канале «%s»" #: ../xfconfd/xfconf-backend-perchannel-xml.c:601 #, c-format msgid "Unable to remove channel \"%s\": %s" -msgstr "Не получилось удалить канал \"%s\": %s" +msgstr "Не удалось удалить канал «%s»: %s" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1298 #, c-format msgid "Invalid type for : \"%s\"" -msgstr "Неправильный тип для : \"%s\"" +msgstr "Неправильный тип для : «%s»" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1314 #: ../xfconfd/xfconf-backend-perchannel-xml.c:1390 #, c-format msgid "Unable to parse value of type \"%s\" from \"%s\"" -msgstr "Не получилось определить значение типа \"%s\" из \"%s\"" +msgstr "Не удалось определить значение типа «%s» из «%s»" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1370 #, c-format @@ -66,23 +67,23 @@ #: ../xfconfd/xfconf-backend-perchannel-xml.c:1379 #, c-format msgid "Invalid type for : \"%s\"" -msgstr "Неправильный тип для : \"%s\"" +msgstr "Неправильный тип для : «%s»" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1655 #: ../xfconfd/xfconf-backend-perchannel-xml.c:1904 #, c-format msgid "Channel \"%s\" does not exist" -msgstr "Канал \"%s\" не существует" +msgstr "Канал «%s» не существует" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1962 #, c-format msgid "Unable to write channel \"%s\": %s" -msgstr "Не удалось записать канал \"%s\": %s" +msgstr "Не удалось записать канал «%s»: %s" #: ../xfconfd/xfconf-backend-factory.c:76 #, c-format msgid "Unable to find Xfconf backend of type \"%s\"" -msgstr "Не удалось найти бэкенд Xfconf типа \"%s\"" +msgstr "Не удалось найти бэкенд Xfconf типа «%s»" #: ../xfconfd/xfconf-backend.c:103 #, c-format @@ -96,19 +97,13 @@ #: ../xfconfd/xfconf-backend.c:126 #, c-format -msgid "" -"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', " -"'-', '<' and '>', as well as '/' as a separator" -msgstr "" -"Названия свойств могут включать только символы ASCII A-Z, a-z, 0-9, '_', " -"'-', '<' и '>', так же как и «/» как разделитель" +msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator" +msgstr "Названия свойств могут включать только символы ASCII A-Z, a-z, 0-9, «_», «-», «<» и «>», так же как и «/» как разделитель" #: ../xfconfd/xfconf-backend.c:135 #, c-format msgid "Property names cannot have two or more consecutive '/' characters" -msgstr "" -"Названия свойств не могут включать более два или более последовательных " -"знаков «/»" +msgstr "Названия свойств не могут включать более двух и более последовательных знаков «/»" #: ../xfconfd/xfconf-backend.c:146 #, c-format @@ -122,37 +117,25 @@ #: ../xfconfd/xfconf-backend.c:176 #, c-format -msgid "" -"Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and " -"'-'" -msgstr "" -"Названия каналов могут включать только символы ASCII A-Z, a-z, 0-9, '_', и " -"'-'" +msgid "Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and '-'" +msgstr "Названия каналов могут включать только символы ASCII A-Z, a-z, 0-9, «_» и «-»" #: ../xfconfd/xfconf-backend.c:398 #, c-format -msgid "" -"The property name can only be empty or \"/\" if a recursive reset was " -"specified" -msgstr "" -"Название свойства может быть только пустым или \"/\" если был выбран " -"рекурсивный сброс" +msgid "The property name can only be empty or \"/\" if a recursive reset was specified" +msgstr "Название свойства может быть только пустым или \"/\" если был выбран рекурсивный сброс" #: ../xfconfd/main.c:134 msgid "Prints the xfconfd version." -msgstr "Показать версию Xfconf" +msgstr "Показать версию Xfconf." #: ../xfconfd/main.c:136 -msgid "" -"Configuration backends to use. The first backend specified is opened read/" -"write; the others, read-only." -msgstr "" -"Бэкенд конфигурации для использования. Первый указанный бэкенд открыт для " -"чтения/записи; остальные только для чтения" +msgid "Configuration backends to use. The first backend specified is opened read/write; the others, read-only." +msgstr "Бэкенд конфигурации для использования. Первый указанный бэкенд открыт для чтения/записи, остальные только для чтения." #: ../xfconfd/main.c:139 msgid "Fork into background after starting; only useful for testing purposes" -msgstr "Поместить на задний план после запуска (полезно для тестовых целей)" +msgstr "Выполнять в фоновом режиме после запуска (полезно только для тестовых целей)" #: ../xfconfd/main.c:159 msgid "Xfce Configuration Daemon" @@ -164,12 +147,12 @@ #: ../xfconfd/main.c:167 msgid "Report bugs to http://bugs.xfce.org/\n" -msgstr "Отправляйте сообщения об ошибке на http://bugs.xfce.org/\n" +msgstr "Об ошибках сообщайте на http://bugs.xfce.org/\n" #: ../xfconfd/main.c:170 #, c-format msgid "Error parsing options: %s\n" -msgstr "Невозможно определить опции: %s\n" +msgstr "Ошибка разбора синтаксиса: %s\n" #: ../xfconfd/xfconf-daemon.c:482 #, c-format @@ -184,17 +167,17 @@ #: ../xfconf-query/main.c:92 #, c-format msgid "Property '%s' changed: %s\n" -msgstr "Свойство '%s' изменено: %s\n" +msgstr "Свойство «%s» изменено: %s\n" #: ../xfconf-query/main.c:97 #, c-format msgid "Property '%s' changed\n" -msgstr "Свойство '%s' изменено\n" +msgstr "Свойство «%s» изменено\n" #: ../xfconf-query/main.c:102 #, c-format msgid "Property '%s' removed\n" -msgstr "Свойство '%s' удалено\n" +msgstr "Свойство «%s» удалено\n" #: ../xfconf-query/main.c:111 #, c-format @@ -208,7 +191,7 @@ #: ../xfconf-query/main.c:191 msgid "Version information" -msgstr "Версия" +msgstr "Информация о версии" #: ../xfconf-query/main.c:195 msgid "The channel to query/modify" @@ -232,7 +215,7 @@ #: ../xfconf-query/main.c:215 msgid "Create a new property if it does not already exist" -msgstr "Создать новое свойство, если оно уже не существует" +msgstr "Создать новое свойство, если оно ещё не существует" #: ../xfconf-query/main.c:219 msgid "Specify the property value type" @@ -257,12 +240,12 @@ #: ../xfconf-query/main.c:349 #, c-format msgid "Start monitoring channel '%s':" -msgstr "Начать следить за каналом '%s':" +msgstr "Начать следить за каналом «%s»:" #: ../xfconf-query/main.c:371 #, c-format msgid "Property \"%s\" does not exist on channel \"%s\".\n" -msgstr "Свойство \"%s\" не существует на канале \"%s\".\n" +msgstr "Свойство «%s» отсутствует на канале «%s».\n" #: ../xfconf-query/main.c:379 ../xfconf-query/main.c:397 msgid "(unknown)" @@ -283,13 +266,13 @@ "Property \"%s\" does not exist on channel \"%s\". If a new\n" "property should be created, use the --create option.\n" msgstr "" -"Свойство \"%s\" не существует на канале \"%s\". Если новое\n" -"свойство должно быть создано, то используйте --create option.\n" +"Свойство «%s» не существует на канале «%s». Если должно\n" +"быть создано новое свойство, то используйте параметр --create.\n" #: ../xfconf-query/main.c:419 #, c-format msgid "When creating a new property, the value type must be specified.\n" -msgstr "Когда создаёте новое свойство, указывайте тип значения.\n" +msgstr "При создании нового свойства, указывайте тип значения.\n" #: ../xfconf-query/main.c:429 #, c-format @@ -303,16 +286,13 @@ #: ../xfconf-query/main.c:453 #, c-format -msgid "" -"A value type must be specified to change an array into a single value.\n" -msgstr "" -"Тип значения должен быть установлен для преобразования массива в одно " -"значение.\n" +msgid "A value type must be specified to change an array into a single value.\n" +msgstr "Для преобразования массива в одно значение должен быть задан тип значения.\n" #: ../xfconf-query/main.c:463 ../xfconf-query/main.c:525 #, c-format msgid "Unable to convert \"%s\" to type \"%s\"\n" -msgstr "Не удалось преобразовать \"%s\" в тип \"%s\"\n" +msgstr "Не удалось преобразовать «%s» в тип «%s»\n" #: ../xfconf-query/main.c:470 ../xfconf-query/main.c:540 #, c-format @@ -322,7 +302,7 @@ #: ../xfconf-query/main.c:495 #, c-format msgid "There are %d new values, but only %d types could be determined.\n" -msgstr "Указано %d новых значений, но только %d типов могут быть определены.\n" +msgstr "Имеется %d новых значений, но определены могут быть только %d типов.\n" #: ../xfconf-query/main.c:516 #, c-format @@ -332,25 +312,19 @@ #: ../xfconf-query/main.c:567 #, c-format msgid "Channel '%s' contains no properties\n" -msgstr "Канал '%s' не имеет свойств\n" +msgstr "Канал «%s» не имеет свойств\n" #: ../xfconf-query/main.c:583 ../xfconf-query/main.c:592 #, c-format msgid "Could not create export file \"%s\": %s\n" -msgstr "Не удалось создать файл экспорта \"%s\": %s\n" +msgstr "Не удалось создать файл экспорта «%s»: %s\n" #: ../xfconf-query/main.c:612 #, c-format msgid "Could not open import file \"%s\": %s\n" -msgstr "Не удалось открыть файл импорта \"%s\": %s\n" +msgstr "Не удалось открыть файл импорта «%s»: %s\n" #: ../xfconf-query/main.c:621 #, c-format msgid "Could not parse import file \"%s\": %s\n" -msgstr "Не удалось прочитать структуру файла импорта \"%s\": %s\n" - -#~ msgid "Export channel to file" -#~ msgstr "Экспортировать канал в файл" - -#~ msgid "Import channel from file" -#~ msgstr "Импортировать канал из файла" +msgstr "Не удалось прочитать структуру файла импорта «%s»: %s\n" diff -Nru xfconf-4.8.0/po/sk.po xfconf-4.8.1/po/sk.po --- xfconf-4.8.0/po/sk.po 2011-01-16 14:52:08.000000000 +0000 +++ xfconf-4.8.1/po/sk.po 2011-12-23 16:05:11.000000000 +0000 @@ -2,18 +2,19 @@ # Copyright (C) 2008 xfconf's Stephan Arts, Brian Tarricone # This file is distributed under the same license as the Xfconf package. # Robert Hartl , 2009. +# Tomáš Vadina , 2011. msgid "" msgstr "" "Project-Id-Version: 4.6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 15:52+0100\n" -"PO-Revision-Date: 2009-09-17 20:09+0200\n" -"Last-Translator: Robert Hartl \n" +"POT-Creation-Date: 2011-06-10 04:36+0000\n" +"PO-Revision-Date: 2011-06-10 10:11+0100\n" +"Last-Translator: Tomáš Vadina \n" "Language-Team: slovak \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" #: ../xfconf/xfconf-cache.c:875 #, c-format @@ -29,7 +30,7 @@ #: ../xfconfd/xfconf-daemon.c:238 #, c-format msgid "Permission denied while modifying property \"%s\" on channel \"%s\"" -msgstr "Prístup pri zmene vlastnosti \"%s\" na kanáli \"%s\" bol zamietunutý" +msgstr "Prístup pri zmene vlastnosti \"%s\" na kanále \"%s\" bol zamietunutý" #: ../xfconfd/xfconf-backend-perchannel-xml.c:387 #: ../xfconfd/xfconf-backend-perchannel-xml.c:469 @@ -37,7 +38,7 @@ #: ../xfconfd/xfconf-backend-perchannel-xml.c:654 #, c-format msgid "Property \"%s\" does not exist on channel \"%s\"" -msgstr "Vlastnosť \"%s\" na kanáli \"%s\" neexistuje" +msgstr "Vlastnosť \"%s\" na kanále \"%s\" neexistuje" #: ../xfconfd/xfconf-backend-perchannel-xml.c:601 #, c-format @@ -93,18 +94,13 @@ #: ../xfconfd/xfconf-backend.c:126 #, c-format -msgid "" -"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', " -"'-', '<' and '>', as well as '/' as a separator" -msgstr "" -"Názvy vlastností môžu obsahovať iba ASCII znaky A-Z, a-z, 0-9, '_', '-', '<' " -"a '>' a tiež '/' ako oddeľovač" +msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator" +msgstr "Názvy vlastností môžu obsahovať iba ASCII znaky A-Z, a-z, 0-9, '_', '-', '<' a '>' a tiež '/' ako oddeľovač" #: ../xfconfd/xfconf-backend.c:135 #, c-format msgid "Property names cannot have two or more consecutive '/' characters" -msgstr "" -"Názvy vlastností nemôžu obsahovať dva a viac po sebe nasledujúcich znakov '/'" +msgstr "Názvy vlastností nemôžu obsahovať dva a viac po sebe nasledujúcich znakov '/'" #: ../xfconfd/xfconf-backend.c:146 #, c-format @@ -118,33 +114,25 @@ #: ../xfconfd/xfconf-backend.c:176 #, c-format -msgid "" -"Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and " -"'-'" +msgid "Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and '-'" msgstr "Názvy kanálov môžu obsahovať iba ASCII znaky A-Z, a-z, 0-9, '_' a '-'" #: ../xfconfd/xfconf-backend.c:398 #, c-format -msgid "" -"The property name can only be empty or \"/\" if a recursive reset was " -"specified" -msgstr "" -"Názov vlastnosti môže byť prázdny alebo \"/\" iba ak bol spresnený " -"rekurzívny reset" +msgid "The property name can only be empty or \"/\" if a recursive reset was specified" +msgstr "Názov vlastnosti môže byť prázdny alebo \"/\" iba ak bol spresnený rekurzívny reset" #: ../xfconfd/main.c:134 msgid "Prints the xfconfd version." -msgstr "Zobrazí verziu xfconfd" +msgstr "Zobrazí verziu xfconfd." #: ../xfconfd/main.c:136 -msgid "" -"Configuration backends to use. The first backend specified is opened read/" -"write; the others, read-only." -msgstr "" +msgid "Configuration backends to use. The first backend specified is opened read/write; the others, read-only." +msgstr "Konfigurovať backendy pre použitie. Prvý zadaný backend je spustený pre čítanie a zápis, ostatné len pre čítanie." #: ../xfconfd/main.c:139 msgid "Fork into background after starting; only useful for testing purposes" -msgstr "" +msgstr "Po spustení preniesť proces na pozadie; táto voľba je užitočná iba pre testovanie" #: ../xfconfd/main.c:159 msgid "Xfce Configuration Daemon" @@ -204,11 +192,11 @@ #: ../xfconf-query/main.c:195 msgid "The channel to query/modify" -msgstr "" +msgstr "Kanál pre zaslanie dopytu alebo modifikácie" #: ../xfconf-query/main.c:199 msgid "The property to query/modify" -msgstr "" +msgstr "Vlastnosť pre zaslanie dopytu alebo modifikácie" #: ../xfconf-query/main.c:203 msgid "The new value to set for the property" @@ -244,19 +232,20 @@ #: ../xfconf-query/main.c:245 msgid "Monitor a channel for property changes" -msgstr "Sledovať zmeny vlastností kanálu" +msgstr "Sledovať zmeny vlastností kanála" #: ../xfconf-query/main.c:349 #, c-format msgid "Start monitoring channel '%s':" -msgstr "Zahájiť sledovanie kanálu „%s“:" +msgstr "Zahájiť sledovanie kanála „%s“:" #: ../xfconf-query/main.c:371 #, c-format msgid "Property \"%s\" does not exist on channel \"%s\".\n" -msgstr "Vlastnosť \"%s\" neexistuje na kanáli \"%s\".\n" +msgstr "Vlastnosť \"%s\" neexistuje na kanále \"%s\".\n" -#: ../xfconf-query/main.c:379 ../xfconf-query/main.c:397 +#: ../xfconf-query/main.c:379 +#: ../xfconf-query/main.c:397 msgid "(unknown)" msgstr "(neznámy)" @@ -274,9 +263,7 @@ msgid "" "Property \"%s\" does not exist on channel \"%s\". If a new\n" "property should be created, use the --create option.\n" -msgstr "" -"Vlastnosť \"%s\" neexistuje na kanáli \"%s\". Ak sa má nová vlastnosť " -"vytvoriť, použite voľbu --create.\n" +msgstr "Vlastnosť \"%s\" neexistuje na kanále \"%s\". Ak sa má nová vlastnosť vytvoriť, použite voľbu --create.\n" #: ../xfconf-query/main.c:419 #, c-format @@ -295,16 +282,17 @@ #: ../xfconf-query/main.c:453 #, c-format -msgid "" -"A value type must be specified to change an array into a single value.\n" +msgid "A value type must be specified to change an array into a single value.\n" msgstr "Pre zmenu poľa na hodnotu je nutné spresniť typ hodnoty.\n" -#: ../xfconf-query/main.c:463 ../xfconf-query/main.c:525 +#: ../xfconf-query/main.c:463 +#: ../xfconf-query/main.c:525 #, c-format msgid "Unable to convert \"%s\" to type \"%s\"\n" msgstr "Nemožno skonvertovať \"%s\" na typ \"%s\"\n" -#: ../xfconf-query/main.c:470 ../xfconf-query/main.c:540 +#: ../xfconf-query/main.c:470 +#: ../xfconf-query/main.c:540 #, c-format msgid "Failed to set property.\n" msgstr "Nepodarilo sa nastaviť vlastnosti.\n" @@ -324,7 +312,8 @@ msgid "Channel '%s' contains no properties\n" msgstr "Kanál „%s“ neobsahuje žiadne vlastnosti\n" -#: ../xfconf-query/main.c:583 ../xfconf-query/main.c:592 +#: ../xfconf-query/main.c:583 +#: ../xfconf-query/main.c:592 #, c-format msgid "Could not create export file \"%s\": %s\n" msgstr "Nedá sa vytvoriť súbor súbor pre export \"%s\": %s\n" @@ -338,3 +327,4 @@ #, c-format msgid "Could not parse import file \"%s\": %s\n" msgstr "Nedá sa spracovať súbor pre import \"%s\": %s\n" + diff -Nru xfconf-4.8.0/po/te.po xfconf-4.8.1/po/te.po --- xfconf-4.8.0/po/te.po 1970-01-01 00:00:00.000000000 +0000 +++ xfconf-4.8.1/po/te.po 2011-12-23 16:05:11.000000000 +0000 @@ -0,0 +1,336 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# Praveen Illa , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-08-22 10:14+0000\n" +"PO-Revision-Date: 2011-08-23 00:51+0530\n" +"Last-Translator: Praveen Illa \n" +"Language-Team: Telugu \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../xfconf/xfconf-cache.c:876 +#, c-format +msgid "Failed to make ResetProperty DBus call" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:277 +#, c-format +msgid "Unable to create configuration directory \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:322 +#: ../xfconfd/xfconf-daemon.c:238 +#, c-format +msgid "Permission denied while modifying property \"%s\" on channel \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:387 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:469 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:634 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:654 ../xfconf-query/main.c:341 +#, c-format +msgid "Property \"%s\" does not exist on channel \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:601 +#, c-format +msgid "Unable to remove channel \"%s\": %s" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1298 +#, c-format +msgid "Invalid type for : \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1314 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1390 +#, c-format +msgid "Unable to parse value of type \"%s\" from \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1370 +#, c-format +msgid "The type attribute of cannot be an array" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1379 +#, c-format +msgid "Invalid type for : \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1655 +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1904 +#, c-format +msgid "Channel \"%s\" does not exist" +msgstr "\"%s\" ఛానల్ ఉనికిలో లేదు" + +#: ../xfconfd/xfconf-backend-perchannel-xml.c:1962 +#, c-format +msgid "Unable to write channel \"%s\": %s" +msgstr "" + +#: ../xfconfd/xfconf-backend-factory.c:76 +#, c-format +msgid "Unable to find Xfconf backend of type \"%s\"" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:103 +#, c-format +msgid "Property names must start with a '/' character" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:112 +#, c-format +msgid "The root element ('/') is not a valid property name" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:126 +#, c-format +msgid "" +"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', " +"'-', '<' and '>', as well as '/' as a separator" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:135 +#, c-format +msgid "Property names cannot have two or more consecutive '/' characters" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:146 +#, c-format +msgid "Property names cannot end with a '/' character" +msgstr "" + +#: ../xfconfd/xfconf-backend.c:163 +#, c-format +msgid "Channel name cannot be an empty string" +msgstr "ఛానల్ పేరు ఒక ఖాళీ పదబంధం కాకూడదు" + +#: ../xfconfd/xfconf-backend.c:176 +#, c-format +msgid "" +"Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and " +"'-'" +msgstr "ఛానల్ పేర్లు ASCII అక్షరాలను మాత్రమే కలిగివుండాలి A-Z, a-z, 0-9, '_', మరియు '-'" + +#: ../xfconfd/xfconf-backend.c:398 +#, c-format +msgid "" +"The property name can only be empty or \"/\" if a recursive reset was " +"specified" +msgstr "" + +#: ../xfconfd/main.c:134 +msgid "Prints the xfconfd version." +msgstr "xfconfd రూపాంతరాన్ని ముద్రిస్తుంది." + +#: ../xfconfd/main.c:136 +msgid "" +"Configuration backends to use. The first backend specified is opened read/" +"write; the others, read-only." +msgstr "" + +#: ../xfconfd/main.c:139 +msgid "Fork into background after starting; only useful for testing purposes" +msgstr "" + +#: ../xfconfd/main.c:159 +msgid "Xfce Configuration Daemon" +msgstr "Xfce స్వరూపణం డెమోన్" + +#: ../xfconfd/main.c:165 +msgid "Xfce configuration daemon" +msgstr "Xfce స్వరూపణం డెమోన్" + +#: ../xfconfd/main.c:167 +msgid "Report bugs to http://bugs.xfce.org/\n" +msgstr "బగ్‌లను http://bugs.xfce.org/ కు నివేదించండి\n" + +#: ../xfconfd/main.c:170 +#, c-format +msgid "Error parsing options: %s\n" +msgstr "" + +#: ../xfconfd/xfconf-daemon.c:482 +#, c-format +msgid "Another Xfconf daemon is already running" +msgstr "వేరొక Xfconf డెమోన్ ఇంతకుముందు నుండే నడుస్తున్నది" + +#: ../xfconfd/xfconf-daemon.c:517 +#, c-format +msgid "No backends could be started" +msgstr "" + +#: ../xfconf-query/main.c:90 ../xfconf-query/main.c:95 +msgid "set" +msgstr "అమర్చు" + +#: ../xfconf-query/main.c:100 +msgid "reset" +msgstr "తిరిగి అమర్చు" + +#: ../xfconf-query/main.c:176 +msgid "Version information" +msgstr "రూపాంతర సమాచారం" + +#: ../xfconf-query/main.c:180 +msgid "The channel to query/modify" +msgstr "" + +#: ../xfconf-query/main.c:184 +msgid "The property to query/modify" +msgstr "" + +#: ../xfconf-query/main.c:188 +msgid "The new value to set for the property" +msgstr "" + +#: ../xfconf-query/main.c:192 +msgid "List properties (or channels if -c is not specified)" +msgstr "" + +#: ../xfconf-query/main.c:196 +msgid "Verbose output" +msgstr "" + +#: ../xfconf-query/main.c:200 +msgid "Create a new property if it does not already exist" +msgstr "ఒకవేళ అది ఇంతకుముందు లేకపోయినట్లయితే ఒక కొత్త లక్షణాన్ని సృష్టించు" + +#: ../xfconf-query/main.c:204 +msgid "Specify the property value type" +msgstr "లక్షణం విలువ రకాన్ని నిర్దేశించు" + +#: ../xfconf-query/main.c:208 +msgid "Reset property" +msgstr "లక్షణాన్ని తిరిగిఅమర్చు" + +#: ../xfconf-query/main.c:212 +msgid "Recursive (use with -r)" +msgstr "" + +#: ../xfconf-query/main.c:216 +msgid "Force array even if only one element" +msgstr "" + +#: ../xfconf-query/main.c:220 +msgid "Invert an existing boolean property" +msgstr "" + +#: ../xfconf-query/main.c:224 +msgid "Monitor a channel for property changes" +msgstr "" + +#: ../xfconf-query/main.c:246 +#, c-format +msgid "Failed to init libxfconf: %s" +msgstr "" + +#: ../xfconf-query/main.c:251 +msgid "- Xfconf commandline utility" +msgstr "" + +#: ../xfconf-query/main.c:256 +#, c-format +msgid "Option parsing failed: %s" +msgstr "" + +#: ../xfconf-query/main.c:266 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce అభివృద్ధి బృందం. అన్ని హక్కులు కేటాయించబడినవి." + +#: ../xfconf-query/main.c:267 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "దయచేసి బగ్‌లను <%s>కు నివేదించండి." + +#: ../xfconf-query/main.c:279 +msgid "Channels:" +msgstr "ఛానళ్ళు:" + +#: ../xfconf-query/main.c:295 +msgid "No property specified" +msgstr "ఏ లక్షణాన్ని నిర్దేశించలేదు" + +#: ../xfconf-query/main.c:301 +msgid "--create and --reset options can not be used together" +msgstr "" + +#: ../xfconf-query/main.c:307 +msgid "--create and --reset options can not be used together with --list" +msgstr "" + +#: ../xfconf-query/main.c:319 +#, c-format +msgid "Start monitoring channel \"%s\":" +msgstr "" + +#: ../xfconf-query/main.c:353 ../xfconf-query/main.c:458 +#: ../xfconf-query/main.c:527 +msgid "Failed to set property" +msgstr "లక్షణాన్ని అమర్చుటలో విఫలమైంది" + +#: ../xfconf-query/main.c:357 +msgid "--toggle only works with boolean values" +msgstr "" + +#: ../xfconf-query/main.c:366 ../xfconf-query/main.c:385 +msgid "(unknown)" +msgstr "(తెలియదు)" + +#: ../xfconf-query/main.c:375 +#, c-format +msgid "Value is an array with %d items:" +msgstr "" + +#: ../xfconf-query/main.c:399 +#, c-format +msgid "" +"Property \"%s\" does not exist on channel \"%s\". If a new property should " +"be created, use the --create option" +msgstr "" + +#: ../xfconf-query/main.c:407 +msgid "When creating a new property, the value type must be specified" +msgstr "" + +#: ../xfconf-query/main.c:417 +msgid "Failed to get the existing type for the value" +msgstr "" + +#: ../xfconf-query/main.c:435 +msgid "Unable to determine the type of the value" +msgstr "" + +#: ../xfconf-query/main.c:441 +msgid "A value type must be specified to change an array into a single value" +msgstr "" + +#: ../xfconf-query/main.c:451 ../xfconf-query/main.c:512 +#, c-format +msgid "Unable to convert \"%s\" to type \"%s\"" +msgstr "" + +#: ../xfconf-query/main.c:483 +#, c-format +msgid "There are %d new values, but only %d types could be determined" +msgstr "" + +#: ../xfconf-query/main.c:504 +#, c-format +msgid "Unable to determine type of value at index %d" +msgstr "" + +#: ../xfconf-query/main.c:554 +#, c-format +msgid "Channel \"%s\" contains no properties" +msgstr "" diff -Nru xfconf-4.8.0/po/tr.po xfconf-4.8.1/po/tr.po --- xfconf-4.8.0/po/tr.po 2011-01-16 14:52:08.000000000 +0000 +++ xfconf-4.8.1/po/tr.po 2011-12-23 16:05:11.000000000 +0000 @@ -1,27 +1,27 @@ # translation of xfconf.po to Turkish # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Server Acim , 2008. msgid "" msgstr "" "Project-Id-Version: xfconf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 15:52+0100\n" +"POT-Creation-Date: 2011-03-19 23:31+0000\n" "PO-Revision-Date: 2009-01-30 21:21+0200\n" "Last-Translator: Gökmen Görgen \n" "Language-Team: Turkish \n" -"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: KBabel 1.11.4\n" #: ../xfconf/xfconf-cache.c:875 -#, fuzzy, c-format +#, c-format msgid "Failed to make ResetProperty DBus call" -msgstr "Özellik ayarlanamadı.\n" +msgstr "ResetProperty DBus çağrısı yapılamadı" #: ../xfconfd/xfconf-backend-perchannel-xml.c:277 #, c-format @@ -96,12 +96,8 @@ #: ../xfconfd/xfconf-backend.c:126 #, c-format -msgid "" -"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', " -"'-', '<' and '>', as well as '/' as a separator" -msgstr "" -"Özellik isimleri sadece aşağıda listenen ASCII karakterlerini içerebilir:A-" -"Z, a-z, 0-9, '_', '-', '<' ve '>', ve ayraç olarak '/'" +msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator" +msgstr "Özellik isimleri sadece aşağıda listenen ASCII karakterlerini içerebilir:A-Z, a-z, 0-9, '_', '-', '<' ve '>', ve ayraç olarak '/'" #: ../xfconfd/xfconf-backend.c:135 #, c-format @@ -120,37 +116,25 @@ #: ../xfconfd/xfconf-backend.c:176 #, c-format -msgid "" -"Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and " -"'-'" -msgstr "" -"Kanal isimleri sadece şu ASCII karakterlerini içerebilir: A-Z, a-z, 0-9, " -"'_', ve '-'" +msgid "Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and '-'" +msgstr "Kanal isimleri sadece şu ASCII karakterlerini içerebilir: A-Z, a-z, 0-9, '_', ve '-'" #: ../xfconfd/xfconf-backend.c:398 #, c-format -msgid "" -"The property name can only be empty or \"/\" if a recursive reset was " -"specified" -msgstr "" -"Eğer özyineli yenileme belirlenmişse, özellik isimleri sadece boş olabilir " -"veya \"/\" karakterinden oluşabilir." +msgid "The property name can only be empty or \"/\" if a recursive reset was specified" +msgstr "Eğer özyineli yenileme belirlenmişse, özellik isimleri sadece boş olabilir veya \"/\" karakterinden oluşabilir." #: ../xfconfd/main.c:134 msgid "Prints the xfconfd version." msgstr "xfconfd sürüm bilgisini gösterir." #: ../xfconfd/main.c:136 -msgid "" -"Configuration backends to use. The first backend specified is opened read/" -"write; the others, read-only." -msgstr "" -"Kullanılacak yapılandırma çıkışları. Belirtilen ilk çıktı okuma/yazma olarak " -"açılır; diğerleri sadece-okunur olarak." +msgid "Configuration backends to use. The first backend specified is opened read/write; the others, read-only." +msgstr "Kullanılacak yapılandırma çıkışları. Belirtilen ilk çıktı okuma/yazma olarak açılır; diğerleri sadece-okunur olarak." #: ../xfconfd/main.c:139 msgid "Fork into background after starting; only useful for testing purposes" -msgstr "" +msgstr "Başlangıçtan sonra arkaplanı çatalla; sadece test amaçlı faydalıdır" #: ../xfconfd/main.c:159 msgid "Xfce Configuration Daemon" @@ -301,11 +285,8 @@ #: ../xfconf-query/main.c:453 #, c-format -msgid "" -"A value type must be specified to change an array into a single value.\n" -msgstr "" -"Bir diziyi tekil değere dönüştürmek istiyorsanız bir değer türü " -"belirlemelisiniz.\n" +msgid "A value type must be specified to change an array into a single value.\n" +msgstr "Bir diziyi tekil değere dönüştürmek istiyorsanız bir değer türü belirlemelisiniz.\n" #: ../xfconf-query/main.c:463 ../xfconf-query/main.c:525 #, c-format diff -Nru xfconf-4.8.0/po/zh_CN.po xfconf-4.8.1/po/zh_CN.po --- xfconf-4.8.0/po/zh_CN.po 2011-01-16 14:52:09.000000000 +0000 +++ xfconf-4.8.1/po/zh_CN.po 2011-12-23 16:05:11.000000000 +0000 @@ -3,16 +3,16 @@ # This file is distributed under the same license as the xfconf package. # Chris K. Zhang , 2009. # Hunt Xu , 2009. -# +# Chipong Luo \n" +"Last-Translator: Chipong Luo \n" "Language-Team: Simplified Chinese \n" -"Language: \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,18 +20,18 @@ #: ../xfconf/xfconf-cache.c:875 #, c-format msgid "Failed to make ResetProperty DBus call" -msgstr "无法通过 DBus 重新设置属性" +msgstr "无法建立 ResetProperty DBus 呼叫" #: ../xfconfd/xfconf-backend-perchannel-xml.c:277 #, c-format msgid "Unable to create configuration directory \"%s\"" -msgstr "无法创建配置目录“%s”" +msgstr "无法创建配置目录 “%s”" #: ../xfconfd/xfconf-backend-perchannel-xml.c:322 #: ../xfconfd/xfconf-daemon.c:238 #, c-format msgid "Permission denied while modifying property \"%s\" on channel \"%s\"" -msgstr "没有修改通道“%2$s”的属性“%1$s”的权限" +msgstr "没有在频道 “%2$s” 修改属性 “%1$s” 的权限" #: ../xfconfd/xfconf-backend-perchannel-xml.c:387 #: ../xfconfd/xfconf-backend-perchannel-xml.c:469 @@ -39,59 +39,59 @@ #: ../xfconfd/xfconf-backend-perchannel-xml.c:654 #, c-format msgid "Property \"%s\" does not exist on channel \"%s\"" -msgstr "通道“%2$s”没有属性“%1$s”" +msgstr "在频道 “%2$s” 属性 “%1$s” 不存在" #: ../xfconfd/xfconf-backend-perchannel-xml.c:601 #, c-format msgid "Unable to remove channel \"%s\": %s" -msgstr "无法移除通道“%s”：%s" +msgstr "无法移除频道 “%s”：%s" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1298 #, c-format msgid "Invalid type for : \"%s\"" -msgstr "<属性>类型无效：“%s”" +msgstr " 类型无效：“%s”" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1314 #: ../xfconfd/xfconf-backend-perchannel-xml.c:1390 #, c-format msgid "Unable to parse value of type \"%s\" from \"%s\"" -msgstr "无法将“%2$s”解析为“%1$s”类型的值" +msgstr "无法从 “%2$s” 解析类型 “%1$s” 的值" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1370 #, c-format msgid "The type attribute of cannot be an array" -msgstr "<值>的类型属性不能是数组" +msgstr " 的类型属性不能是数组" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1379 #, c-format msgid "Invalid type for : \"%s\"" -msgstr "<值>类型无效：“%s”" +msgstr " 类型无效：“%s”" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1655 #: ../xfconfd/xfconf-backend-perchannel-xml.c:1904 #, c-format msgid "Channel \"%s\" does not exist" -msgstr "通道“%s”不存在" +msgstr "频道 “%s” 不存在" #: ../xfconfd/xfconf-backend-perchannel-xml.c:1962 #, c-format msgid "Unable to write channel \"%s\": %s" -msgstr "无法写入通道“%s”：%s" +msgstr "无法写入频道 “%s”：%s" #: ../xfconfd/xfconf-backend-factory.c:76 #, c-format msgid "Unable to find Xfconf backend of type \"%s\"" -msgstr "找不到“%s”类型的 Xfconf 后台" +msgstr "找不到类型 “%s” 的 Xfconf 后端" #: ../xfconfd/xfconf-backend.c:103 #, c-format msgid "Property names must start with a '/' character" -msgstr "属性名称必须以“/”字符开头" +msgstr "属性名称必须以 ‘/’ 字符开头" #: ../xfconfd/xfconf-backend.c:112 #, c-format msgid "The root element ('/') is not a valid property name" -msgstr "根元素(“/”)不能做属性名称" +msgstr "根元素(‘/’)不是有效的属性名称" #: ../xfconfd/xfconf-backend.c:126 #, c-format @@ -99,37 +99,37 @@ "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', " "'-', '<' and '>', as well as '/' as a separator" msgstr "" -"属性名称只能包含 ASCII 字符 A-Z, a-z, 0-9, _, -, <, 或者 >, “/”可用做\n" -"分隔符" +"属性名称只能包含 ASCII 字符 A-Z 、 a-z 、 0-9 、 ‘_’ 、 ‘-’ 、 " +"‘<’ 和 ‘>’ ，而 ‘/’ 作为分隔符" #: ../xfconfd/xfconf-backend.c:135 #, c-format msgid "Property names cannot have two or more consecutive '/' characters" -msgstr "属性名称不能有两个以上连续的“/”字符" +msgstr "属性名称不能包含两个或更多连续的 ‘/’ 字符" #: ../xfconfd/xfconf-backend.c:146 #, c-format msgid "Property names cannot end with a '/' character" -msgstr "属性名称不能以“/”字符结束" +msgstr "属性名称不能以 ‘/’ 字符结束" #: ../xfconfd/xfconf-backend.c:163 #, c-format msgid "Channel name cannot be an empty string" -msgstr "通道名称不能为空" +msgstr "频道名称不能为空字符串" #: ../xfconfd/xfconf-backend.c:176 #, c-format msgid "" "Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and " "'-'" -msgstr "通道名称只能包含 ASCII 字符 A-Z, a-z, 0-9, _, 或者 －" +msgstr "频道名称只能包含 ASCII 字符 A-Z 、 a-z 、 0-9 、 ‘_’ 、 和 ‘-’" #: ../xfconfd/xfconf-backend.c:398 #, c-format msgid "" "The property name can only be empty or \"/\" if a recursive reset was " "specified" -msgstr "只有当指定递归重置以后属性名称才能为空或者“/”" +msgstr "只有当指定递归重置以后属性名称才能为空或者 “/”" #: ../xfconfd/main.c:134 msgid "Prints the xfconfd version." @@ -139,11 +139,11 @@ msgid "" "Configuration backends to use. The first backend specified is opened read/" "write; the others, read-only." -msgstr "配置要使用的后台。第一个后台可读写，其余的只读。" +msgstr "要使用的配置后端。第一个后端可读写，其余的只读。" #: ../xfconfd/main.c:139 msgid "Fork into background after starting; only useful for testing purposes" -msgstr "启动后转到后台运行；建议只在测试时使用" +msgstr "启动后转到后台；只对测试目的有用" #: ../xfconfd/main.c:159 msgid "Xfce Configuration Daemon" @@ -155,37 +155,37 @@ #: ../xfconfd/main.c:167 msgid "Report bugs to http://bugs.xfce.org/\n" -msgstr "请到 http://bugs.xfce.org/ 报告程序漏洞\n" +msgstr "向 http://bugs.xfce.org/ 报告缺陷\n" #: ../xfconfd/main.c:170 #, c-format msgid "Error parsing options: %s\n" -msgstr "解析选项“%s”时出错。\n" +msgstr "解析选项时出错：%s\n" #: ../xfconfd/xfconf-daemon.c:482 #, c-format msgid "Another Xfconf daemon is already running" -msgstr "另一个 Xfconf 守护进程已经在运行了" +msgstr "另一个 Xfconf 守护进程已在运行" #: ../xfconfd/xfconf-daemon.c:517 #, c-format msgid "No backends could be started" -msgstr "无法启动任何后台" +msgstr "没有可以启动的后端" #: ../xfconf-query/main.c:92 #, c-format msgid "Property '%s' changed: %s\n" -msgstr "属性“%s”已改变：%s\n" +msgstr "属性 ‘%s’ 已更改：%s\n" #: ../xfconf-query/main.c:97 #, c-format msgid "Property '%s' changed\n" -msgstr "属性“%s”已改变\n" +msgstr "属性 ‘%s’ 已更改\n" #: ../xfconf-query/main.c:102 #, c-format msgid "Property '%s' removed\n" -msgstr "属性“%s”已删除\n" +msgstr "属性 ‘%s’ 已移除\n" #: ../xfconf-query/main.c:111 #, c-format @@ -203,7 +203,7 @@ #: ../xfconf-query/main.c:195 msgid "The channel to query/modify" -msgstr "要查询/修改的通道" +msgstr "要查询/修改的频道" #: ../xfconf-query/main.c:199 msgid "The property to query/modify" @@ -211,19 +211,19 @@ #: ../xfconf-query/main.c:203 msgid "The new value to set for the property" -msgstr "新的属性值" +msgstr "要为属性设置的新的值" #: ../xfconf-query/main.c:207 msgid "List properties (or channels if -c is not specified)" -msgstr "属性列表(如果使用 -c 选项则给出通道列表)" +msgstr "列出属性(如果没有指定 -c 则为频道)" #: ../xfconf-query/main.c:211 msgid "Verbose output" -msgstr "详细输出" +msgstr "冗长输出" #: ../xfconf-query/main.c:215 msgid "Create a new property if it does not already exist" -msgstr "如果该属性不存在就新建一个" +msgstr "如果属性不存在就新建一个" #: ../xfconf-query/main.c:219 msgid "Specify the property value type" @@ -235,25 +235,25 @@ #: ../xfconf-query/main.c:227 msgid "Recursive (use with -r)" -msgstr "使用递归(用 -r 选项时使用)" +msgstr "递归(加上 -r 使用)" #: ../xfconf-query/main.c:231 msgid "Force array even if only one element" -msgstr "即使只有一个元素也使用数组" +msgstr "即使只有一个元素也强制使用数组" #: ../xfconf-query/main.c:245 msgid "Monitor a channel for property changes" -msgstr "监视通道中属性变化" +msgstr "监视频道中属性更改" #: ../xfconf-query/main.c:349 #, c-format msgid "Start monitoring channel '%s':" -msgstr "开始监视通道“%s”:" +msgstr "开始监视频道 ‘%s’：" #: ../xfconf-query/main.c:371 #, c-format msgid "Property \"%s\" does not exist on channel \"%s\".\n" -msgstr "通道“%2$s”没有属性“%1$s”\n" +msgstr "在频道 “%2$s” 没有属性 “%1$s” 存在。\n" #: ../xfconf-query/main.c:379 ../xfconf-query/main.c:397 msgid "(unknown)" @@ -265,7 +265,7 @@ "Value is an array with %d items:\n" "\n" msgstr "" -"值是一个 %d 元素的数组:\n" +"值是一个 %d 项目的数组：\n" "\n" #: ../xfconf-query/main.c:411 @@ -273,17 +273,19 @@ msgid "" "Property \"%s\" does not exist on channel \"%s\". If a new\n" "property should be created, use the --create option.\n" -msgstr "通道“%2$s”没有属性“%1$s”。如果你要新建属性，请使用 --create 选项。\n" +msgstr "" +"在频道 “%2$s” 没有属性 “%1$s” 存在。\n" +"如果应该新建属性，使用 --create 选项。\n" #: ../xfconf-query/main.c:419 #, c-format msgid "When creating a new property, the value type must be specified.\n" -msgstr "创建新属性时必须指定数据类型。\n" +msgstr "创建新属性时必须指定值类型。\n" #: ../xfconf-query/main.c:429 #, c-format msgid "Failed to get the existing type for the value.\n" -msgstr "无法读出该值的当前类型。\n" +msgstr "无法获取该值的当前类型。\n" #: ../xfconf-query/main.c:447 #, c-format @@ -294,12 +296,12 @@ #, c-format msgid "" "A value type must be specified to change an array into a single value.\n" -msgstr "把数组改为单一值时必须指定值的类型。\n" +msgstr "把数组改为单一值时必须指定值类型。\n" #: ../xfconf-query/main.c:463 ../xfconf-query/main.c:525 #, c-format msgid "Unable to convert \"%s\" to type \"%s\"\n" -msgstr "无法把“%s”转换成类型“%s”\n" +msgstr "无法将 “%s” 转换成类型 “%s”\n" #: ../xfconf-query/main.c:470 ../xfconf-query/main.c:540 #, c-format @@ -309,41 +311,29 @@ #: ../xfconf-query/main.c:495 #, c-format msgid "There are %d new values, but only %d types could be determined.\n" -msgstr "%d 个新值中，只能确定 %d 个的类型。\n" +msgstr "有 %d 个新值，但只能确定 %d 个类型。\n" #: ../xfconf-query/main.c:516 #, c-format msgid "Unable to determine type of value at index %d.\n" -msgstr "无法确定第 %d 个值的类型\n" +msgstr "无法确定在索引 %d 的值的类型。\n" #: ../xfconf-query/main.c:567 #, c-format msgid "Channel '%s' contains no properties\n" -msgstr "通道“%s”没有任何属性\n" +msgstr "频道 ‘%s’ 没有包含属性\n" #: ../xfconf-query/main.c:583 ../xfconf-query/main.c:592 #, c-format msgid "Could not create export file \"%s\": %s\n" -msgstr "无法创建导出文件“%s”：%s\n" +msgstr "无法创建导出文件 “%s”：%s\n" #: ../xfconf-query/main.c:612 #, c-format msgid "Could not open import file \"%s\": %s\n" -msgstr "无法打开导入文件“%s”：%s\n" +msgstr "无法打开导入文件 “%s”：%s\n" #: ../xfconf-query/main.c:621 #, c-format msgid "Could not parse import file \"%s\": %s\n" -msgstr "无法解析导入文件“%s”：%s\n" - -#~ msgid "Export channel to file" -#~ msgstr "把通道导出到文件" - -#~ msgid "Import channel from file" -#~ msgstr "从文件导入通道" - -#~ msgid "true" -#~ msgstr "对" - -#~ msgid "false" -#~ msgstr "错" +msgstr "无法解析导入文件 “%s”：%s\n" diff -Nru xfconf-4.8.0/tests/get-properties/Makefile.in xfconf-4.8.1/tests/get-properties/Makefile.in --- xfconf-4.8.0/tests/get-properties/Makefile.in 2011-01-16 14:51:55.000000000 +0000 +++ xfconf-4.8.1/tests/get-properties/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -139,6 +139,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -156,9 +157,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -189,6 +193,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -234,6 +239,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@ diff -Nru xfconf-4.8.0/tests/has-properties/Makefile.in xfconf-4.8.1/tests/has-properties/Makefile.in --- xfconf-4.8.0/tests/has-properties/Makefile.in 2011-01-16 14:51:56.000000000 +0000 +++ xfconf-4.8.1/tests/has-properties/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -139,6 +139,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -156,9 +157,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -189,6 +193,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -234,6 +239,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@ diff -Nru xfconf-4.8.0/tests/Makefile.in xfconf-4.8.1/tests/Makefile.in --- xfconf-4.8.0/tests/Makefile.in 2011-01-16 14:51:55.000000000 +0000 +++ xfconf-4.8.1/tests/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -120,6 +120,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -137,9 +138,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -168,6 +172,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -213,6 +218,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@ diff -Nru xfconf-4.8.0/tests/object-bindings/Makefile.in xfconf-4.8.1/tests/object-bindings/Makefile.in --- xfconf-4.8.0/tests/object-bindings/Makefile.in 2011-01-16 14:51:56.000000000 +0000 +++ xfconf-4.8.1/tests/object-bindings/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -112,6 +112,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -129,9 +130,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -162,6 +166,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -207,6 +212,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@ diff -Nru xfconf-4.8.0/tests/property-changed-signal/Makefile.in xfconf-4.8.1/tests/property-changed-signal/Makefile.in --- xfconf-4.8.0/tests/property-changed-signal/Makefile.in 2011-01-16 14:51:56.000000000 +0000 +++ xfconf-4.8.1/tests/property-changed-signal/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -122,6 +122,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -139,9 +140,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -172,6 +176,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -217,6 +222,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@ diff -Nru xfconf-4.8.0/tests/reset-properties/Makefile.in xfconf-4.8.1/tests/reset-properties/Makefile.in --- xfconf-4.8.0/tests/reset-properties/Makefile.in 2011-01-16 14:51:56.000000000 +0000 +++ xfconf-4.8.1/tests/reset-properties/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -139,6 +139,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -156,9 +157,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -189,6 +193,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -234,6 +239,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@ diff -Nru xfconf-4.8.0/tests/set-properties/Makefile.in xfconf-4.8.1/tests/set-properties/Makefile.in --- xfconf-4.8.0/tests/set-properties/Makefile.in 2011-01-16 14:51:56.000000000 +0000 +++ xfconf-4.8.1/tests/set-properties/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -139,6 +139,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -156,9 +157,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -189,6 +193,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -234,6 +239,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@ diff -Nru xfconf-4.8.0/xfconf/Makefile.in xfconf-4.8.1/xfconf/Makefile.in --- xfconf-4.8.0/xfconf/Makefile.in 2011-01-16 14:51:56.000000000 +0000 +++ xfconf-4.8.1/xfconf/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -154,6 +154,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -171,9 +172,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -202,6 +206,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -247,6 +252,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@ diff -Nru xfconf-4.8.0/xfconf/xfconf-binding.c xfconf-4.8.1/xfconf/xfconf-binding.c --- xfconf-4.8.0/xfconf/xfconf-binding.c 2011-01-16 14:48:38.000000000 +0000 +++ xfconf-4.8.1/xfconf/xfconf-binding.c 2011-12-23 16:05:11.000000000 +0000 @@ -583,12 +583,12 @@ if(XFCONF_IS_CHANNEL(channel_or_object)) { n = g_signal_handlers_disconnect_matched(channel_or_object, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, - G_CALLBACK(xfconf_g_property_channel_notify), + xfconf_g_property_channel_notify, NULL); } else { n = g_signal_handlers_disconnect_matched(channel_or_object, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, - G_CALLBACK(xfconf_g_property_object_notify), + xfconf_g_property_object_notify, NULL); } diff -Nru xfconf-4.8.0/xfconf/xfconf-cache.c xfconf-4.8.1/xfconf/xfconf-cache.c --- xfconf-4.8.0/xfconf/xfconf-cache.c 2011-01-16 14:48:38.000000000 +0000 +++ xfconf-4.8.1/xfconf/xfconf-cache.c 2011-12-23 16:05:11.000000000 +0000 @@ -510,6 +510,10 @@ goto out; } + g_hash_table_remove(cache->old_properties, old_item->property); + /* don't destroy old_item yet */ + g_hash_table_steal(cache->pending_calls, old_item->call); + item = g_tree_lookup(cache->properties, old_item->property); if(G_UNLIKELY(!item)) { #ifndef NDEBUG @@ -518,10 +522,6 @@ goto out; } - g_hash_table_remove(cache->old_properties, old_item->property); - /* don't destroy old_item yet */ - g_hash_table_steal(cache->pending_calls, old_item->call); - if(!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_INVALID)) { /* failed to set the value. reset it to the old value and send * a prop changed signal to the channel */ diff -Nru xfconf-4.8.0/xfconf/xfconf-channel.c xfconf-4.8.1/xfconf/xfconf-channel.c --- xfconf-4.8.0/xfconf/xfconf-channel.c 2011-01-16 14:48:38.000000000 +0000 +++ xfconf-4.8.1/xfconf/xfconf-channel.c 2011-12-23 16:05:11.000000000 +0000 @@ -330,7 +330,7 @@ channel->disposed = TRUE; g_signal_handlers_disconnect_by_func(channel->cache, - G_CALLBACK(xfconf_channel_property_changed), + xfconf_channel_property_changed, channel); g_object_unref(G_OBJECT(channel->cache)); } diff -Nru xfconf-4.8.0/xfconfd/main.c xfconf-4.8.1/xfconfd/main.c --- xfconf-4.8.0/xfconfd/main.c 2011-01-16 14:48:38.000000000 +0000 +++ xfconf-4.8.1/xfconfd/main.c 2011-12-23 16:05:11.000000000 +0000 @@ -67,7 +67,7 @@ sighandler(int sig) { guint32 sigstate; - gint avoid_gcc_warning; + gint avoid_gcc_warning G_GNUC_UNUSED; switch(sig) { case SIGUSR1: @@ -78,7 +78,7 @@ sigstate = SIGNAL_QUIT; break; } - + avoid_gcc_warning = write(signal_pipe[1], &sigstate, sizeof(sigstate)); } diff -Nru xfconf-4.8.0/xfconfd/Makefile.am xfconf-4.8.1/xfconfd/Makefile.am --- xfconf-4.8.0/xfconfd/Makefile.am 2011-01-16 14:48:38.000000000 +0000 +++ xfconf-4.8.1/xfconfd/Makefile.am 2011-12-23 16:05:11.000000000 +0000 @@ -1,5 +1,5 @@ -xfconfddir = $(libdir)/xfce4/xfconf +xfconfddir = $(HELPER_PATH_PREFIX)/xfce4/xfconf xfconfd_PROGRAMS = xfconfd xfconf_backend_sources = @@ -56,7 +56,7 @@ service_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in - $(AM_V_GEN) sed -e "s,\@libdir\@,$(libdir),g" < $< > $@ + $(AM_V_GEN) sed -e "s,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),g" < $< > $@ CLEANFILES = \ $(service_DATA) diff -Nru xfconf-4.8.0/xfconfd/Makefile.in xfconf-4.8.1/xfconfd/Makefile.in --- xfconf-4.8.0/xfconfd/Makefile.in 2011-01-16 14:51:56.000000000 +0000 +++ xfconf-4.8.1/xfconfd/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -161,6 +161,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -178,9 +179,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -209,6 +213,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -254,6 +259,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@ @@ -301,7 +307,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xfconfddir = $(libdir)/xfce4/xfconf +xfconfddir = $(HELPER_PATH_PREFIX)/xfce4/xfconf xfconf_backend_sources = $(am__append_1) xfconfd_SOURCES = \ main.c \ @@ -820,7 +826,7 @@ %.service: %.service.in - $(AM_V_GEN) sed -e "s,\@libdir\@,$(libdir),g" < $< > $@ + $(AM_V_GEN) sed -e "s,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),g" < $< > $@ @MAINTAINER_MODE_TRUE@xfconf-dbus-server.h: $(top_srcdir)/common/xfconf-dbus.xml @MAINTAINER_MODE_TRUE@ $(AM_V_GEN) dbus-binding-tool --mode=glib-server --prefix=xfconf $< > $@ diff -Nru xfconf-4.8.0/xfconfd/org.xfce.Xfconf.service.in xfconf-4.8.1/xfconfd/org.xfce.Xfconf.service.in --- xfconf-4.8.0/xfconfd/org.xfce.Xfconf.service.in 2011-01-16 14:48:38.000000000 +0000 +++ xfconf-4.8.1/xfconfd/org.xfce.Xfconf.service.in 2011-12-23 16:05:11.000000000 +0000 @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.xfce.Xfconf -Exec=@libdir@/xfce4/xfconf/xfconfd +Exec=@HELPERDIR@/xfce4/xfconf/xfconfd diff -Nru xfconf-4.8.0/xfconfd/xfconf-dbus-server.h xfconf-4.8.1/xfconfd/xfconf-dbus-server.h --- xfconf-4.8.0/xfconfd/xfconf-dbus-server.h 2011-01-16 14:52:13.000000000 +0000 +++ xfconf-4.8.1/xfconfd/xfconf-dbus-server.h 2011-12-23 16:05:26.000000000 +0000 @@ -103,6 +103,10 @@ } #define dbus_glib_marshal_xfconf_NONE__STRING_STRING_BOXED_POINTER dbus_glib_marshal_xfconf_VOID__STRING_STRING_BOXED_POINTER +/* NONE:POINTER */ +#define dbus_glib_marshal_xfconf_VOID__POINTER g_cclosure_marshal_VOID__POINTER +#define dbus_glib_marshal_xfconf_NONE__POINTER dbus_glib_marshal_xfconf_VOID__POINTER + /* NONE:STRING,STRING,POINTER */ extern void dbus_glib_marshal_xfconf_VOID__STRING_STRING_POINTER (GClosure *closure, GValue *return_value, @@ -197,10 +201,6 @@ } #define dbus_glib_marshal_xfconf_NONE__STRING_STRING_BOOLEAN_POINTER dbus_glib_marshal_xfconf_VOID__STRING_STRING_BOOLEAN_POINTER -/* NONE:POINTER */ -#define dbus_glib_marshal_xfconf_VOID__POINTER g_cclosure_marshal_VOID__POINTER -#define dbus_glib_marshal_xfconf_NONE__POINTER dbus_glib_marshal_xfconf_VOID__POINTER - G_END_DECLS #endif /* __dbus_glib_marshal_xfconf_MARSHAL_H__ */ @@ -216,8 +216,7 @@ { (GCallback) xfconf_is_property_locked, dbus_glib_marshal_xfconf_NONE__STRING_STRING_POINTER, 421 }, }; -const DBusGObjectInfo dbus_glib_xfconf_object_info = { - 0, +const DBusGObjectInfo dbus_glib_xfconf_object_info = { 1, dbus_glib_xfconf_methods, 7, "org.xfce.Xfconf\0SetProperty\0A\0channel\0I\0s\0property\0I\0s\0value\0I\0v\0\0org.xfce.Xfconf\0GetProperty\0A\0channel\0I\0s\0property\0I\0s\0value\0O\0F\0N\0v\0\0org.xfce.Xfconf\0GetAllProperties\0A\0channel\0I\0s\0property_base\0I\0s\0properties\0O\0F\0N\0a{sv}\0\0org.xfce.Xfconf\0PropertyExists\0A\0channel\0I\0s\0property\0I\0s\0exists\0O\0F\0N\0b\0\0org.xfce.Xfconf\0ResetProperty\0A\0channel\0I\0s\0property\0I\0s\0recursive\0I\0b\0\0org.xfce.Xfconf\0ListChannels\0A\0channels\0O\0F\0N\0as\0\0org.xfce.Xfconf\0IsPropertyLocked\0A\0channel\0I\0s\0property\0I\0s\0locked\0O\0F\0N\0b\0\0\0", diff -Nru xfconf-4.8.0/xfconf-perl/Makefile.in xfconf-4.8.1/xfconf-perl/Makefile.in --- xfconf-4.8.0/xfconf-perl/Makefile.in 2011-01-16 14:51:56.000000000 +0000 +++ xfconf-4.8.1/xfconf-perl/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -121,6 +121,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -138,9 +139,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -169,6 +173,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -214,6 +219,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@ diff -Nru xfconf-4.8.0/xfconf-perl/xs/Makefile.in xfconf-4.8.1/xfconf-perl/xs/Makefile.in --- xfconf-4.8.0/xfconf-perl/xs/Makefile.in 2011-01-16 14:51:56.000000000 +0000 +++ xfconf-4.8.1/xfconf-perl/xs/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -80,6 +80,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -97,9 +98,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -128,6 +132,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -173,6 +178,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@ diff -Nru xfconf-4.8.0/xfconf-query/Makefile.in xfconf-4.8.1/xfconf-query/Makefile.in --- xfconf-4.8.0/xfconf-query/Makefile.in 2011-01-16 14:51:56.000000000 +0000 +++ xfconf-4.8.1/xfconf-query/Makefile.in 2011-12-23 16:05:15.000000000 +0000 @@ -119,6 +119,7 @@ DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -136,9 +137,12 @@ 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@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HELPER_PATH_PREFIX = @HELPER_PATH_PREFIX@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -167,6 +171,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -212,6 +217,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@