diff -Nru gnome-session-3.16.0/ChangeLog gnome-session-3.18.1.2/ChangeLog --- gnome-session-3.16.0/ChangeLog 2015-03-23 17:37:05.000000000 +0000 +++ gnome-session-3.18.1.2/ChangeLog 2015-10-15 20:46:48.000000000 +0000 @@ -1,6 +1,333 @@ # Generated by Makefile. Do not edit. -commit cf4083afd4533fffb59e46d2bdc47f6c3fac06f7 (HEAD, master) +commit 4ab09c39738adaaf16116b3bd82e47188b5483cd (HEAD -> master, github/master) +Author: Ray Strode +Date: Thu Oct 15 16:45:33 2015 -0400 + + configure: bump to 3.18.1.2 + +M configure.ac + +commit bd446274e638754c947702d2ee06f704c4a075b3 (origin/master, origin/HEAD) +Author: Ray Strode +Date: Thu Oct 15 08:40:51 2015 -0400 + + build-goo: generate shell script wrapper in different way + + Using configure to generate the wrapper doesn't work unless + we switch to AS_AC_EXPAND or something since the libexecdir + won't fully expand to an absolute path by default. + + This commit drops the idea of using configure to generate + the wrapper and instead falls back to good old sed. + + https://bugzilla.gnome.org/show_bug.cgi?id=756633 + +M configure.ac +M gnome-session/Makefile.am + +commit 445b9075115ecd5b6d20170f1fc0435e05beadfa (tag: 3.18.1.1) +Author: Ray Strode +Date: Wed Oct 14 15:32:59 2015 -0400 + + configure: bump to 3.18.1.1 + +M configure.ac + +commit 85626385ff8617fca32f8828145588dd45683126 +Author: Ray Strode +Date: Wed Oct 14 15:32:44 2015 -0400 + + NEWS: update for release + +M NEWS + +commit c9eec29ea4228de8f90f94e9a2124a6cbc1ebf00 +Author: Ray Strode +Date: Wed Oct 14 14:32:03 2015 -0400 + + main: fix typos I introduced + + I reworked some of Giovanni's code and introduced + a few typos in commit 6b8d94ae13b2bec1db1bcff4ab4cc67bf63fda9f + + https://bugzilla.gnome.org/show_bug.cgi?id=756324 + +M gnome-session/main.c + +commit b0001177c828db2331c03c74a97e87780ba37a8e (tag: 3.18.1) +Author: Ray Strode +Date: Wed Oct 14 11:51:14 2015 -0400 + + configure: bump to 3.18.1 + +M configure.ac + +commit a121230380eddccbe4473b4b559d254f76745e4f +Author: Ray Strode +Date: Wed Oct 14 11:50:47 2015 -0400 + + Version 3.18.1 + + * No longer stash environment in $XDG_RUNTIME_DIR/gnome/environment + * Set SSH_AUTH_SOCK explicitly for wayland sessions + * Set LC environment variables up front, so g-s-d doesn't have to do + it and hand it back to us later + * Set IBus environment variables too + * Translation updates + +M NEWS + +commit 6b8d94ae13b2bec1db1bcff4ab4cc67bf63fda9f +Author: Giovanni Campagna +Date: Fri Oct 9 14:54:42 2015 -0700 + + Make sure we use the local gio vfs in gnome-settings + + So that we don't accidentally start gvfsd too early + + Patch slightly modified by Ray Strode to preserve + original glib environment variable values. + + https://bugzilla.gnome.org/show_bug.cgi?id=756324 + +M gnome-session/main.c + +commit 39f146e6c5727105a3c88c2290654c6ef83102c5 +Author: Giovanni Campagna +Date: Fri Oct 9 14:49:04 2015 -0700 + + Read and apply LC_* environment variables from GSettings + + Before anything else runs + + https://bugzilla.gnome.org/show_bug.cgi?id=756324 + +M configure.ac +M gnome-session/Makefile.am +A gnome-session/gnome-session.in +M gnome-session/main.c + +commit a8896ccad65583885735a04205351f48a42f29ae +Author: Ray Strode +Date: Wed Oct 14 10:53:39 2015 -0400 + + main: set SSH_AUTH_SOCK explicitly in wayland sessions + + Until we can get a more complete environment variable + propagation story figured, implement a quick hack + for the most pressing one, SSH_AUTH_SOCK. + + https://bugzilla.gnome.org/show_bug.cgi?id=738205 + +M gnome-session/main.c + +commit 3c26d87bd89128a1bd5859f90adc028fcbee5e8e +Author: Ray Strode +Date: Wed Oct 14 10:06:35 2015 -0400 + + Revert "gsm-util: save environment to $XDG_RUNTIME_DIR/gnome/environment" + + This reverts commit db7ce81e9acd5859cb929496e39880d8b4fdc1bf and + commit a50a182ef66c58896ba6d8a5d393fb898ece2bbf. + + We're probably going to solve this problem a different way. + +M gnome-session/gsm-util.c + +commit 8c277825f106f051f806f496a944534342410a4e +Author: Ray Strode +Date: Wed Oct 14 09:43:15 2015 -0400 + + configure: bump minimum library requires to 3.18 ones + + https://bugzilla.gnome.org/show_bug.cgi?id=756546 + +M configure.ac + +commit 9af8474a027edecf7c73827964fd88bc960266d6 +Author: Pedro Albuquerque +Date: Wed Oct 7 05:31:40 2015 +0000 + + Updated Portuguese translation + +M po/pt.po + +commit aacfb5d64b7cc4910f858cf8efb2eafdf2b404ac +Author: Jiri Grönroos +Date: Mon Oct 5 17:08:32 2015 +0000 + + Updated Finnish translation + +M po/fi.po + +commit a50a182ef66c58896ba6d8a5d393fb898ece2bbf +Author: Ray Strode +Date: Thu Sep 17 08:03:10 2015 -0400 + + gsm-util: fix leak in new gsm_util_save_environment function + + gsm_util_save_environment calls g_get_environ() without calling + g_strfreev() on the result. + + This commit addresses the problem by using the environ external + variable, directly, instead, and avoiding the allocation + altogether. + + https://bugzilla.gnome.org/show_bug.cgi?id=738205 + +M gnome-session/gsm-util.c + +commit e5c28ee81c91d659e592de55e0fc42e8e936d128 (tag: 3.18.0, tag: 3.17.92) +Author: Ray Strode +Date: Wed Sep 16 22:23:29 2015 -0400 + + configure: bump to 3.17.92 + +M configure.ac + +commit b91bc6dff940348b12273abbaf6c77574871904d +Author: Ray Strode +Date: Wed Sep 16 22:23:17 2015 -0400 + + NEWS: update for release + +M NEWS + +commit db7ce81e9acd5859cb929496e39880d8b4fdc1bf +Author: Ray Strode +Date: Wed Sep 16 14:51:20 2015 -0400 + + gsm-util: save environment to $XDG_RUNTIME_DIR/gnome/environment + + Environment variables are problematic because they require a parent + child inheritance model, but they're often used in a per-session scope. + + gnome-session provides a mechanism for children to affect the + environment of future siblings via the SetEnv dbus method call. + Unfortunately that change does not affect existing siblings, or their + offspring. + + This commit centralizes gnome-session's environment into a file, + + $XDG_RUNTIME_DIR/gnome/environment + + so other components in the session can ensure their children get the + most up to date environment possible. + + https://bugzilla.gnome.org/show_bug.cgi?id=738205 + +M gnome-session/gsm-util.c + +commit e9310040c25d7e8eb4dc43b7fc7dcff71dbc7cab +Author: Arash Mousavi +Date: Fri Sep 11 23:55:06 2015 +0430 + + Updated Persian translation + +M po/fa.po + +commit e2e566ce08bb4bc4a595be24038fdab47fb4e7fb +Author: Hannie Dumoleyn +Date: Mon Aug 24 18:03:21 2015 +0200 + + Updated Dutch translation Master 3.18 + +M po/nl.po + +commit 2feb84095cd8f078ca159a1e7a8737f96b011c09 +Author: Piotr Drąg +Date: Mon Aug 24 16:15:36 2015 +0200 + + Updated Polish translation + +M po/pl.po + +commit 89a0b1673dbb9487cfc1cc350bedc2f06dd3e66c +Author: Pedro Albuquerque +Date: Sun Jul 26 08:52:40 2015 +0000 + + Updated Portuguese translation + +M po/pt.po + +commit 8d6ddd71f4871686ec54d204650fb08a89c7be38 +Author: Fabio Tomat +Date: Sun Jul 5 12:51:13 2015 +0000 + + Updated Friulian translation + +M po/fur.po + +commit 455fa5eb5700f6aa96f5e0f247fcd1f0031aa106 +Author: Pedro Albuquerque +Date: Mon Jun 29 22:26:33 2015 +0000 + + Updated Portuguese translation + +M po/pt.po + +commit 6c839246cfa021afc3a8bcb328b41801743da6a0 +Author: Daniel Șerbănescu +Date: Mon Jun 22 17:52:39 2015 +0200 + + Updated Romanian Translation + +M po/ro.po + +commit 6e306120ff06db8bda370a9c971cf1f042076fd9 +Author: Akom Chotiphantawanon +Date: Thu May 21 14:56:42 2015 +0700 + + Updated Thai translation + +M po/th.po + +commit ab6dc4640901e04a25771a95324fc9dea04cad47 +Author: Cédric Valmary +Date: Sun May 10 13:03:07 2015 +0000 + + Updated Occitan translation + +M po/oc.po + +commit 4ecce19f432a781a27d2a90528577275e8f26585 +Author: laurent Soleil +Date: Tue Apr 28 13:19:08 2015 +0000 + + Updated Occitan translation + +M po/oc.po + +commit a3c0ac9134b4dd6712faa4c6424d4c64f0e6410e +Author: Jakub Steiner +Date: Thu Mar 26 14:35:18 2015 +0100 + + icon: provide a symbolic variant of the app icon + + Since 3.16 the high contrast accessible theme is + covered by the recolorable symbolic variant of the app icon. + + The symbolic size has been introduced to hicolor to cope with + the nominal size of 16x16 rather than the backward compatible + 128x128. + + https://bugzilla.gnome.org/show_bug.cgi?id=746811 + +M configure.ac +M data/icons/Makefile.am +A data/icons/symbolic/Makefile.am +A data/icons/symbolic/session-properties-symbolic.svg + +commit e0e53710ebae47d41f2454ca8895395d1cc788d0 +Author: Hajime Taira +Date: Sun Mar 29 19:57:53 2015 +0900 + + l10n: Update Japanese translation + +M po/ja.po + +commit cf4083afd4533fffb59e46d2bdc47f6c3fac06f7 (tag: 3.16.0, github/gnome-3-16, gnome-3-16) Author: Ray Strode Date: Mon Mar 23 13:27:29 2015 -0400 @@ -16,7 +343,7 @@ M NEWS -commit 9ae7a269ee0fc39aaeaa408044837c3d8f9f5b85 (tag: 3.15.92, origin/master, origin/HEAD) +commit 9ae7a269ee0fc39aaeaa408044837c3d8f9f5b85 (tag: 3.15.92) Author: Ray Strode Date: Wed Mar 18 07:45:13 2015 -0400 @@ -559,7 +886,7 @@ M gnome-session/gsm-xsmp-client.c M gnome-session/main.c -commit 24ba982d88c108da186593da729a9e67e0f83441 (foo) +commit 24ba982d88c108da186593da729a9e67e0f83441 Author: Cosimo Cecchi Date: Sat Oct 25 20:51:20 2014 -0700 @@ -808,7 +1135,7 @@ M gnome-session/main.c -commit 3442740ad4808f91fb857fb2dda3c24992f0bbdf (origin/gnome-3-12) +commit 3442740ad4808f91fb857fb2dda3c24992f0bbdf (github/gnome-3-12, gnome-3-12) Author: Matthias Clasen Date: Fri Nov 14 09:49:21 2014 -0500 @@ -6422,7 +6749,7 @@ M gnome-session/gsm-manager.c -commit 67d74de13eb7bbceb6b0c22b653052a670119ea3 (origin/gnome-3-4) +commit 67d74de13eb7bbceb6b0c22b653052a670119ea3 Author: Vincent Untz Date: Mon Jun 4 17:29:06 2012 +0200 @@ -13624,7 +13951,7 @@ M configure.in -commit 57061e91e301fde7df8a6b344ff634d01ea799b0 (tag: GNOME_SESSION_2_28_0) +commit 57061e91e301fde7df8a6b344ff634d01ea799b0 (tag: before-gnome-2-28-Patch2-xsmp-stop.patch, tag: before-gnome-2-28-#Patch1-show-lock.patch, tag: before-gnome-2-28-#Patch0-unresponsive-timeout.patch, tag: before-gnome-2-28, tag: GNOME_SESSION_2_28_0, github/gnome-2-28-#Patch1-show-lock.patch, github/gnome-2-28-#Patch0-unresponsive-timeout.patch, gnome-2-28-#Patch1-show-lock.patch, gnome-2-28-#Patch0-unresponsive-timeout.patch) Author: Vincent Untz Date: Mon Sep 21 18:24:12 2009 +0200 diff -Nru gnome-session-3.16.0/config.h.in gnome-session-3.18.1.2/config.h.in --- gnome-session-3.16.0/config.h.in 2015-03-23 17:27:54.000000000 +0000 +++ gnome-session-3.18.1.2/config.h.in 2015-10-15 20:46:19.000000000 +0000 @@ -90,8 +90,7 @@ /* Have the X Transport library */ #undef HAVE_XTRANS -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff -Nru gnome-session-3.16.0/configure gnome-session-3.18.1.2/configure --- gnome-session-3.16.0/configure 2015-03-23 17:27:53.000000000 +0000 +++ gnome-session-3.18.1.2/configure 2015-10-15 20:46:18.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-session 3.16.0. +# Generated by GNU Autoconf 2.69 for gnome-session 3.18.1.2. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gnome-session' PACKAGE_TARNAME='gnome-session' -PACKAGE_VERSION='3.16.0' -PACKAGE_STRING='gnome-session 3.16.0' +PACKAGE_VERSION='3.18.1.2' +PACKAGE_STRING='gnome-session 3.18.1.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session' PACKAGE_URL='' @@ -754,6 +754,7 @@ MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE CPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -878,6 +879,7 @@ enable_shared with_pic enable_fast_install +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -907,6 +909,7 @@ PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR +LT_SYS_LIBRARY_PATH CPP SESSION_SELECTOR_CFLAGS SESSION_SELECTOR_LIBS @@ -1486,7 +1489,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 gnome-session 3.16.0 to adapt to many kinds of systems. +\`configure' configures gnome-session 3.18.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1556,7 +1559,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-session 3.16.0:";; + short | recursive ) echo "Configuration of gnome-session 3.18.1.2:";; esac cat <<\_ACEOF @@ -1600,9 +1603,12 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --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-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --without-xtrans Build without xtrans support (results in ICE listening on remote TCP ports) @@ -1619,6 +1625,8 @@ directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CPP C preprocessor SESSION_SELECTOR_CFLAGS C compiler flags for SESSION_SELECTOR, overriding pkg-config @@ -1747,7 +1755,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-session configure 3.16.0 +gnome-session configure 3.18.1.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2116,7 +2124,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-session $as_me 3.16.0, which was +It was created by gnome-session $as_me 3.18.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2985,7 +2993,7 @@ # Define the identity of the package. PACKAGE='gnome-session' - VERSION='3.16.0' + VERSION='3.18.1.2' cat >>confdefs.h <<_ACEOF @@ -4447,8 +4455,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -4462,7 +4470,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -4582,7 +4590,7 @@ $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -4905,19 +4913,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -4931,7 +4939,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -4942,7 +4950,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -4953,32 +4961,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -5021,33 +5029,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -5058,15 +5071,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -5172,9 +5185,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -5182,8 +5195,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -5234,7 +5247,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -5274,7 +5287,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5324,22 +5337,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env 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 + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -5357,7 +5371,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -5375,30 +5389,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -5521,13 +5511,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -5655,13 +5645,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -5688,8 +5678,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -5725,10 +5714,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5767,7 +5752,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -5789,8 +5774,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -5843,6 +5828,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -6000,8 +5988,8 @@ 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 + # two different shell functions defined in ltmain.sh; + # decide which one 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 @@ -6013,7 +6001,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -6168,7 +6156,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; 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 @@ -6176,7 +6164,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -6189,7 +6177,7 @@ { $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 +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -6406,7 +6394,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -6496,7 +6484,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -6529,14 +6517,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$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"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6554,21 +6572,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -6616,11 +6637,11 @@ 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 +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -6646,7 +6667,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -6666,13 +6687,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -6693,7 +6714,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -6746,6 +6767,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -6758,9 +6789,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -6770,8 +6801,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $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 @@ -6783,18 +6814,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6803,24 +6915,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -6849,9 +6962,50 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6865,7 +7019,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -6910,7 +7071,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -6950,13 +7111,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6968,7 +7130,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -6977,7 +7139,7 @@ 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" + LD=${LD-ld}_sol2 fi ;; *) @@ -6993,7 +7155,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -7104,7 +7266,7 @@ 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 +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -7607,7 +7769,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -7625,7 +7787,7 @@ 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 + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7664,7 +7826,7 @@ 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_ld_exported_symbols_list" >&5 @@ -7693,7 +7855,7 @@ _lt_result=$? 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 + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7706,32 +7868,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7739,6 +7901,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8034,14 +8231,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8070,14 +8267,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8102,14 +8299,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8117,8 +8314,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -8134,14 +8329,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8155,11 +8350,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -8208,7 +8455,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -8247,7 +8494,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -8258,14 +8505,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -8274,15 +8521,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -8297,22 +8537,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8335,13 +8575,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8363,22 +8603,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8401,13 +8641,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8428,7 +8668,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8490,7 +8730,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -8506,7 +8746,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8536,7 +8776,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -8554,17 +8794,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -8575,8 +8816,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -8592,6 +8833,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -8662,7 +8908,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -8670,10 +8916,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -8689,7 +8954,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -8698,9 +8963,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -8725,6 +8990,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -8822,7 +9093,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -8851,7 +9122,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -8883,7 +9154,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8913,7 +9184,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -8945,7 +9216,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -8964,13 +9235,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -9090,8 +9361,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -9103,9 +9374,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -9148,9 +9419,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -9165,7 +9436,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -9173,7 +9444,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -9183,7 +9454,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -9205,24 +9476,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -9235,7 +9506,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -9254,7 +9525,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9270,7 +9541,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -9280,7 +9551,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -9288,61 +9559,89 @@ 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' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9353,42 +9652,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; 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='${wl}-rpath ${wl}$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 + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9402,8 +9706,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - 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' + 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 ;; @@ -9421,8 +9725,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - 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' + 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 @@ -9434,7 +9738,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -9449,9 +9753,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9468,15 +9772,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - 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' + 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 ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -9492,7 +9796,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -9500,34 +9804,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -9546,13 +9873,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -9571,35 +9906,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9634,7 +9976,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9642,17 +9984,17 @@ 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" + 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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9687,7 +10029,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9695,21 +10037,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -9718,7 +10072,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9748,16 +10102,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + 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=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $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 @@ -9766,18 +10121,18 @@ # 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' + 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 @@ -9786,7 +10141,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + 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. @@ -9805,24 +10160,24 @@ hardcode_direct=no hardcode_automatic=yes 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\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -9864,33 +10219,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - 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' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$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' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -9898,25 +10253,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${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 $pic_flag ${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 case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -9928,7 +10283,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -9947,14 +10302,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -9962,8 +10317,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -9974,7 +10329,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -9985,8 +10340,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - 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' + if test yes = "$GCC"; then + 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. @@ -9996,8 +10351,8 @@ 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" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -10009,24 +10364,34 @@ 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' + if test yes = "$lt_cv_irix_exported_symbol"; 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' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -10041,7 +10406,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -10049,27 +10414,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -10080,33 +10437,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $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' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -10117,24 +10494,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + 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 $pic_flag ${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"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -10144,11 +10521,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -10158,10 +10535,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -10210,43 +10587,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -10261,10 +10638,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -10272,7 +10649,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -10298,7 +10675,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -10513,14 +10890,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -10536,28 +10913,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -10571,7 +10955,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -10580,7 +10964,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -10597,14 +10981,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -10612,41 +10998,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -10656,18 +11092,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -10675,8 +11111,8 @@ bsdi[45]*) 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -10688,7 +11124,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -10697,8 +11133,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + 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~ @@ -10714,17 +11150,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + 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' @@ -10733,8 +11169,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -10761,7 +11197,7 @@ 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" + 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'` @@ -10774,8 +11210,8 @@ 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'\''`~ + 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' @@ -10788,7 +11224,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -10801,8 +11237,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -10815,8 +11251,8 @@ 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' + 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 ;; @@ -10834,12 +11270,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -10864,26 +11301,15 @@ esac ;; -gnu*) - 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 # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -10901,14 +11327,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -10916,8 +11343,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -10926,8 +11353,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -10940,8 +11367,8 @@ 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10952,7 +11379,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -10960,8 +11387,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -10980,8 +11407,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -10990,13 +11417,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -11043,11 +11490,15 @@ # 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 + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) 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" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11064,12 +11515,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -11079,7 +11530,7 @@ newsos6) 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}' + 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 ;; @@ -11088,58 +11539,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -11150,8 +11611,8 @@ 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -11161,11 +11622,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -11173,8 +11634,8 @@ sysv4 | sysv4.3*) 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -11195,24 +11656,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then 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' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -11230,7 +11691,7 @@ 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}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -11238,8 +11699,8 @@ uts4*) 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' + 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 ;; @@ -11249,20 +11710,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -11359,15 +11835,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -11382,12 +11858,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -11397,7 +11873,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -11407,23 +11883,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # 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 ${ac_cv_lib_dl_dlopen+:} false; then : @@ -11461,10 +11937,10 @@ { $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" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -11472,10 +11948,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + 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; } @@ -11514,11 +11998,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + 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; } @@ -11557,7 +12041,7 @@ { $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" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + 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; } @@ -11596,7 +12080,7 @@ { $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" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + 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; } @@ -11635,7 +12119,7 @@ { $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" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -11656,21 +12140,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -11678,7 +12162,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11725,9 +12209,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11757,7 +12241,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11777,14 +12261,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11831,9 +12315,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11863,7 +12347,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11884,9 +12368,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -11930,7 +12414,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -11958,7 +12442,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -11966,13 +12450,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -11980,8 +12464,12 @@ ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -11991,7 +12479,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -12005,7 +12493,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC @@ -12201,12 +12689,12 @@ fi -GLIB_REQUIRED=2.35.0 -GTK3_REQUIRED=2.90.7 +GLIB_REQUIRED=2.46.0 +GTK3_REQUIRED=3.18.0 DBUS_GLIB_REQUIRED=0.76 UPOWER_REQUIRED=0.9.0 JSON_GLIB_REQUIRED=0.10 -GNOME_DESKTOP_REQUIRED=3.9.91 +GNOME_DESKTOP_REQUIRED=3.18.0 # Check whether --enable-session-selector was given. if test "${enable_session_selector+set}" = set; then : @@ -16184,7 +16672,7 @@ fi fi -ac_config_files="$ac_config_files Makefile doc/Makefile doc/dbus/Makefile doc/dbus/gnome-session.xml doc/man/Makefile data/Makefile data/org.gnome.SessionManager.gschema.xml data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile gnome-session/Makefile tools/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile doc/Makefile doc/dbus/Makefile doc/dbus/gnome-session.xml doc/man/Makefile data/Makefile data/org.gnome.SessionManager.gschema.xml data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile data/icons/symbolic/Makefile gnome-session/Makefile tools/Makefile po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16752,7 +17240,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-session $as_me 3.16.0, which was +This file was extended by gnome-session $as_me 3.18.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16818,7 +17306,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-session config.status 3.16.0 +gnome-session config.status 3.18.1.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -16953,6 +17441,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $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"`' @@ -17002,10 +17491,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $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"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $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"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $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"`' @@ -17070,7 +17562,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -17121,9 +17614,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -17158,7 +17654,7 @@ striplib; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17185,10 +17681,11 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec; do +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17197,19 +17694,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -17243,6 +17737,7 @@ "data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/Makefile" ;; "data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/Makefile" ;; "data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/Makefile" ;; + "data/icons/symbolic/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/symbolic/Makefile" ;; "gnome-session/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-session/Makefile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; @@ -17937,55 +18432,53 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="" +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -18005,6 +18498,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -18122,18 +18618,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # 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. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -18224,8 +18729,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -18318,13 +18826,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -18376,13 +18884,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -18391,7 +18958,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -18401,165 +18968,6 @@ 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 - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" diff -Nru gnome-session-3.16.0/configure.ac gnome-session-3.18.1.2/configure.ac --- gnome-session-3.16.0/configure.ac 2015-03-23 17:27:18.000000000 +0000 +++ gnome-session-3.18.1.2/configure.ac 2015-10-15 20:45:27.000000000 +0000 @@ -1,5 +1,5 @@ AC_INIT([gnome-session], - [3.16.0], + [3.18.1.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session]) AC_CONFIG_SRCDIR([gnome-session]) @@ -33,12 +33,12 @@ AC_SUBST([DISABLE_DEPRECATED_CFLAGS]) fi -GLIB_REQUIRED=2.35.0 -GTK3_REQUIRED=2.90.7 +GLIB_REQUIRED=2.46.0 +GTK3_REQUIRED=3.18.0 DBUS_GLIB_REQUIRED=0.76 UPOWER_REQUIRED=0.9.0 JSON_GLIB_REQUIRED=0.10 -GNOME_DESKTOP_REQUIRED=3.9.91 +GNOME_DESKTOP_REQUIRED=3.18.0 AC_ARG_ENABLE(session-selector, AS_HELP_STRING([--enable-session-selector], [enable building a custom session selector dialog]), @@ -378,6 +378,7 @@ data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile +data/icons/symbolic/Makefile gnome-session/Makefile tools/Makefile po/Makefile.in diff -Nru gnome-session-3.16.0/data/icons/16x16/Makefile.in gnome-session-3.18.1.2/data/icons/16x16/Makefile.in --- gnome-session-3.16.0/data/icons/16x16/Makefile.in 2015-03-23 17:27:55.000000000 +0000 +++ gnome-session-3.18.1.2/data/icons/16x16/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -235,6 +235,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru gnome-session-3.16.0/data/icons/22x22/Makefile.in gnome-session-3.18.1.2/data/icons/22x22/Makefile.in --- gnome-session-3.16.0/data/icons/22x22/Makefile.in 2015-03-23 17:27:55.000000000 +0000 +++ gnome-session-3.18.1.2/data/icons/22x22/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -235,6 +235,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru gnome-session-3.16.0/data/icons/24x24/Makefile.in gnome-session-3.18.1.2/data/icons/24x24/Makefile.in --- gnome-session-3.16.0/data/icons/24x24/Makefile.in 2015-03-23 17:27:55.000000000 +0000 +++ gnome-session-3.18.1.2/data/icons/24x24/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -235,6 +235,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru gnome-session-3.16.0/data/icons/32x32/Makefile.in gnome-session-3.18.1.2/data/icons/32x32/Makefile.in --- gnome-session-3.16.0/data/icons/32x32/Makefile.in 2015-03-23 17:27:56.000000000 +0000 +++ gnome-session-3.18.1.2/data/icons/32x32/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -235,6 +235,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru gnome-session-3.16.0/data/icons/48x48/Makefile.in gnome-session-3.18.1.2/data/icons/48x48/Makefile.in --- gnome-session-3.16.0/data/icons/48x48/Makefile.in 2015-03-23 17:27:56.000000000 +0000 +++ gnome-session-3.18.1.2/data/icons/48x48/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -235,6 +235,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru gnome-session-3.16.0/data/icons/Makefile.am gnome-session-3.18.1.2/data/icons/Makefile.am --- gnome-session-3.16.0/data/icons/Makefile.am 2014-12-05 17:24:24.000000000 +0000 +++ gnome-session-3.18.1.2/data/icons/Makefile.am 2015-09-16 17:18:35.000000000 +0000 @@ -1,3 +1,3 @@ -SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable +SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable symbolic -include $(top_srcdir)/git.mk diff -Nru gnome-session-3.16.0/data/icons/Makefile.in gnome-session-3.18.1.2/data/icons/Makefile.in --- gnome-session-3.16.0/data/icons/Makefile.in 2015-03-23 17:27:56.000000000 +0000 +++ gnome-session-3.18.1.2/data/icons/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -265,6 +265,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -380,7 +381,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable +SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable symbolic all: all-recursive .SUFFIXES: diff -Nru gnome-session-3.16.0/data/icons/scalable/Makefile.in gnome-session-3.18.1.2/data/icons/scalable/Makefile.in --- gnome-session-3.16.0/data/icons/scalable/Makefile.in 2015-03-23 17:27:56.000000000 +0000 +++ gnome-session-3.18.1.2/data/icons/scalable/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -235,6 +235,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru gnome-session-3.16.0/data/icons/symbolic/Makefile.am gnome-session-3.18.1.2/data/icons/symbolic/Makefile.am --- gnome-session-3.16.0/data/icons/symbolic/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ gnome-session-3.18.1.2/data/icons/symbolic/Makefile.am 2015-09-16 17:18:35.000000000 +0000 @@ -0,0 +1,25 @@ +size = symbolic + +themedir = $(datadir)/icons/hicolor +iconsdir = $(themedir)/$(size)/apps + +icons_DATA = session-properties-symbolic.svg + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +uninstall-hook: + @rm -f $(DESTDIR)$(themedir)/icon-theme.cache + +EXTRA_DIST = \ + $(icons_DATA) + +-include $(top_srcdir)/git.mk diff -Nru gnome-session-3.16.0/data/icons/symbolic/Makefile.in gnome-session-3.18.1.2/data/icons/symbolic/Makefile.in --- gnome-session-3.16.0/data/icons/symbolic/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ gnome-session-3.18.1.2/data/icons/symbolic/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -0,0 +1,597 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = data/icons/symbolic +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(iconsdir)" +DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CONSOLEKIT_CFLAGS = @CONSOLEKIT_CFLAGS@ +CONSOLEKIT_LIBS = @CONSOLEKIT_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGG_SMCLIENT_CFLAGS = @EGG_SMCLIENT_CFLAGS@ +EGG_SMCLIENT_LIBS = @EGG_SMCLIENT_LIBS@ +EGREP = @EGREP@ +EXECINFO_LIBS = @EXECINFO_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIOUNIX_CFLAGS = @GIOUNIX_CFLAGS@ +GIOUNIX_LIBS = @GIOUNIX_LIBS@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GL_TEST_CFLAGS = @GL_TEST_CFLAGS@ +GL_TEST_LIBS = @GL_TEST_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@ +GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@ +GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +HAVE_XRENDER = @HAVE_XRENDER@ +HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ +ICE_CFLAGS = @ICE_CFLAGS@ +ICE_LIBS = @ICE_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SESSION_PROPERTIES_CFLAGS = @SESSION_PROPERTIES_CFLAGS@ +SESSION_PROPERTIES_LIBS = @SESSION_PROPERTIES_LIBS@ +SESSION_SELECTOR_CFLAGS = @SESSION_SELECTOR_CFLAGS@ +SESSION_SELECTOR_LIBS = @SESSION_SELECTOR_LIBS@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SM_CFLAGS = @SM_CFLAGS@ +SM_LIBS = @SM_LIBS@ +STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +X11_CFLAGS = @X11_CFLAGS@ +X11_LIBS = @X11_LIBS@ +XEXT_CFLAGS = @XEXT_CFLAGS@ +XEXT_LIBS = @XEXT_LIBS@ +XGETTEXT = @XGETTEXT@ +XMLTO = @XMLTO@ +XRENDER_CFLAGS = @XRENDER_CFLAGS@ +XRENDER_LIBS = @XRENDER_LIBS@ +XSLTPROC = @XSLTPROC@ +XTEST_CFLAGS = @XTEST_CFLAGS@ +XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ +abs_builddir = @abs_builddir@ +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@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +size = symbolic +themedir = $(datadir)/icons/hicolor +iconsdir = $(themedir)/$(size)/apps +icons_DATA = session-properties-symbolic.svg +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor +EXTRA_DIST = \ + $(icons_DATA) + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/symbolic/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/icons/symbolic/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) + @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \ + done + +uninstall-iconsDATA: + @$(NORMAL_UNINSTALL) + @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(iconsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-iconsDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-iconsDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +.MAKE: install-am install-data-am install-strip uninstall-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-iconsDATA \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-hook uninstall-iconsDATA + +.PRECIOUS: Makefile + + +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +uninstall-hook: + @rm -f $(DESTDIR)$(themedir)/icon-theme.cache + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru gnome-session-3.16.0/data/icons/symbolic/session-properties-symbolic.svg gnome-session-3.18.1.2/data/icons/symbolic/session-properties-symbolic.svg --- gnome-session-3.16.0/data/icons/symbolic/session-properties-symbolic.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-session-3.18.1.2/data/icons/symbolic/session-properties-symbolic.svg 2015-09-16 17:18:35.000000000 +0000 @@ -0,0 +1,28 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + diff -Nru gnome-session-3.16.0/data/Makefile.in gnome-session-3.18.1.2/data/Makefile.in --- gnome-session-3.16.0/data/Makefile.in 2015-03-23 17:27:55.000000000 +0000 +++ gnome-session-3.18.1.2/data/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -303,6 +303,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru gnome-session-3.16.0/debian/changelog gnome-session-3.18.1.2/debian/changelog --- gnome-session-3.16.0/debian/changelog 2015-11-02 15:39:05.000000000 +0000 +++ gnome-session-3.18.1.2/debian/changelog 2015-11-12 00:08:52.000000000 +0000 @@ -1,8 +1,75 @@ -gnome-session (3.16.0-1ubuntu3) xenial; urgency=medium +gnome-session (3.18.1.2-1ubuntu1) xenial; urgency=medium - * No-change rebuild against new gnome libraries + * Merge from Debian unstable. Remaining changes (LP: #1512914): + - debian/control.in: + + Recommend session-migration + + Remove gnome-shell circular dep to ease uprades + - Split ubuntu-session out of gnome-session. + - Split wayland session into gnome-session-wayland + + control.in: add gnome-session-wayland package and depend on xwayland + + gnome-session-wayland.install: install wayland session + - Add upstart user session + - debian/gnome-session-bin.postinst, debian/gnome-session-bin.prerm: + Moved registering gnome-session binary as a session manager to + gnome-session-bin package + - don't install defaults.list (installed by desktop-file-utils in ubuntu): + debian/gnome-session-common.dirs and gnome-session-common.install + - debian/patches/13_display_session_properties.patch: Display + session-properties as the Startup Applications capplet was removed from + gnome-control-center, which makes it hard to discover the + gnome-session-properties tool. (Closes: #683814) + - debian/patches/22_support_autostart_delay.patch: + Bugzilla patch to support adding a delay to autostart apps, using + a "X-GNOME-Autostart-Delay" key in the desktop file + - debian/patches/50_ubuntu_sessions.patch: + + Add Ubuntu session + + gnome-shell.desktop adds --session=gnome now that the "ubuntu" session + is the default. Use TryExec to test if gnome-shell is installed. + - debian/patches/51_remove_session_saving_from_gui.patch: + add GNOME_SESSION_SAVE environment variable for people wanting to + use the save session still, knowing that it can break your system + if used unwisely + - debian/patches/53_add_sessionmigration.patch, debian/control: + recommends and launch the session-migration if present at the start of + the session. This sync tool is running different session migration + scripts that can be provided in various desktop packages. + - debian/patches/95_dbus_request_shutdown.patch: Add "RequestShutdown" and + "RequestReboot" DBus methods to allow other applications to shutdown or + reboot the machine via the session manager. + - debian/patches/103_kill_the_fail_whale.patch: Kill the Fail Whale as it + tends to be more annoying than helpful + - debian/patches/revert_remove_gnome_session_properties.patch: Keep the + session-properties applet for ubuntu sessions - -- Iain Lane Mon, 02 Nov 2015 15:39:05 +0000 + -- Tim Lunn Thu, 12 Nov 2015 10:32:51 +1100 + +gnome-session (3.18.1.2-1) unstable; urgency=medium + + * New upstream release. + * Update Build-Depends as per configure.ac: + - Bump libglib2.0-dev to (>= 2.46.0). (Closes: #801736) + - Bump libgtk-3-dev to (>= 3.18.0). + - Bump libgnome-desktop-3-dev to (>= 3.18.0). + + -- Michael Biebl Wed, 21 Oct 2015 16:23:10 +0200 + +gnome-session (3.18.0-1) unstable; urgency=medium + + * New upstream release (identical to 3.17.92). + * Upload to unstable. + * Drop obsolete Breaks, Conflicts and Replaces from pre-wheezy. + * Drop obsolete Provides: gnome3-session since there are no more reverse + dependencies. + * Update README.Debian, the package for the metacity/gnome-panel based + fallback session is called "gnome-session-flashback". + + -- Michael Biebl Sun, 11 Oct 2015 19:04:24 +0200 + +gnome-session (3.17.92-1) experimental; urgency=medium + + * New upstream release candidate. + + -- Andreas Henriksson Thu, 17 Sep 2015 16:30:30 +0200 gnome-session (3.16.0-1ubuntu2) wily; urgency=medium diff -Nru gnome-session-3.16.0/debian/control gnome-session-3.18.1.2/debian/control --- gnome-session-3.16.0/debian/control 2015-07-28 09:20:58.000000000 +0000 +++ gnome-session-3.18.1.2/debian/control 2015-11-12 00:08:53.000000000 +0000 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Dmitry Shachnev , Michael Biebl +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Dmitry Shachnev , Michael Biebl Standards-Version: 3.9.6 Build-Depends: cdbs (>= 0.4.41), dh-autoreconf, @@ -15,10 +15,10 @@ gnome-pkg-tools (>= 0.13), gnome-common, intltool (>= 0.40.6), - libglib2.0-dev (>= 2.39.90), - libgtk-3-dev (>= 2.90.7), + libglib2.0-dev (>= 2.46.0), + libgtk-3-dev (>= 3.18.0), libjson-glib-dev (>= 0.10), - libgnome-desktop-3-dev (>= 3.9.91), + libgnome-desktop-3-dev (>= 3.18.0), libsm-dev, libice-dev, libx11-dev, @@ -46,14 +46,7 @@ Suggests: gnome-user-guide, desktop-base, gnome-keyring -Replaces: gnome-session-bin (<< 3.0), - gnome3-session -Breaks: bug-buddy (<< 2.20), - xserver-xorg (<< 1:7.4), - gnome-power-manager (<< 2.28) -Conflicts: gnome3-session -Provides: x-session-manager, - gnome3-session +Provides: x-session-manager Description: GNOME Session Manager - GNOME 3 session The GNOME Session Manager is in charge of starting the core components of the GNOME desktop, and applications that should be launched at @@ -127,9 +120,6 @@ Package: gnome-session-common Architecture: all Depends: ${misc:Depends} -Replaces: gnome-session (<< 3.0), - gnome-session-bin (<< 3.0), - libgnomevfs2-common (<< 1:2.24.0-3) Description: GNOME Session Manager - common files The GNOME Session Manager is in charge of starting the core components of the GNOME desktop, and applications that should be launched at diff -Nru gnome-session-3.16.0/debian/control.in gnome-session-3.18.1.2/debian/control.in --- gnome-session-3.16.0/debian/control.in 2015-07-28 09:20:56.000000000 +0000 +++ gnome-session-3.18.1.2/debian/control.in 2015-11-12 00:08:52.000000000 +0000 @@ -11,10 +11,10 @@ gnome-pkg-tools (>= 0.13), gnome-common, intltool (>= 0.40.6), - libglib2.0-dev (>= 2.39.90), - libgtk-3-dev (>= 2.90.7), + libglib2.0-dev (>= 2.46.0), + libgtk-3-dev (>= 3.18.0), libjson-glib-dev (>= 0.10), - libgnome-desktop-3-dev (>= 3.9.91), + libgnome-desktop-3-dev (>= 3.18.0), libsm-dev, libice-dev, libx11-dev, @@ -42,14 +42,7 @@ Suggests: gnome-user-guide, desktop-base, gnome-keyring -Replaces: gnome-session-bin (<< 3.0), - gnome3-session -Breaks: bug-buddy (<< 2.20), - xserver-xorg (<< 1:7.4), - gnome-power-manager (<< 2.28) -Conflicts: gnome3-session -Provides: x-session-manager, - gnome3-session +Provides: x-session-manager Description: GNOME Session Manager - GNOME 3 session The GNOME Session Manager is in charge of starting the core components of the GNOME desktop, and applications that should be launched at @@ -123,9 +116,6 @@ Package: gnome-session-common Architecture: all Depends: ${misc:Depends} -Replaces: gnome-session (<< 3.0), - gnome-session-bin (<< 3.0), - libgnomevfs2-common (<< 1:2.24.0-3) Description: GNOME Session Manager - common files The GNOME Session Manager is in charge of starting the core components of the GNOME desktop, and applications that should be launched at diff -Nru gnome-session-3.16.0/debian/README.Debian gnome-session-3.18.1.2/debian/README.Debian --- gnome-session-3.16.0/debian/README.Debian 2015-07-28 09:20:56.000000000 +0000 +++ gnome-session-3.18.1.2/debian/README.Debian 2015-11-12 00:08:52.000000000 +0000 @@ -5,7 +5,7 @@ ------------------------ The gnome-session package provides the standard GNOME 3 session, which -is based on the GNOME Shell. The gnome-session-fallback package provides +is based on the GNOME Shell. The gnome-session-flashback package provides a “fallback” session which is based on the GNOME panel and Metacity. You can choose them in the display manager (typically GDM). diff -Nru gnome-session-3.16.0/debian/rules gnome-session-3.18.1.2/debian/rules --- gnome-session-3.16.0/debian/rules 2015-07-28 09:20:56.000000000 +0000 +++ gnome-session-3.18.1.2/debian/rules 2015-11-12 00:08:52.000000000 +0000 @@ -22,4 +22,3 @@ install/gnome-session-bin:: install -m 644 -D debian/gnome-session-bin.user-session.upstart debian/gnome-session-bin/usr/share/upstart/sessions/gnome-session.conf - diff -Nru gnome-session-3.16.0/doc/dbus/Makefile.in gnome-session-3.18.1.2/doc/dbus/Makefile.in --- gnome-session-3.16.0/doc/dbus/Makefile.in 2015-03-23 17:27:56.000000000 +0000 +++ gnome-session-3.18.1.2/doc/dbus/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -235,6 +235,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru gnome-session-3.16.0/doc/Makefile.in gnome-session-3.18.1.2/doc/Makefile.in --- gnome-session-3.16.0/doc/Makefile.in 2015-03-23 17:27:56.000000000 +0000 +++ gnome-session-3.18.1.2/doc/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -266,6 +266,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru gnome-session-3.16.0/doc/man/gnome-session-inhibit.1 gnome-session-3.18.1.2/doc/man/gnome-session-inhibit.1 --- gnome-session-3.16.0/doc/man/gnome-session-inhibit.1 2014-12-12 13:42:41.000000000 +0000 +++ gnome-session-3.18.1.2/doc/man/gnome-session-inhibit.1 2014-07-18 20:54:25.000000000 +0000 @@ -2,7 +2,7 @@ .\" Title: gnome-session-inhibit .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/12/2014 +.\" Date: 07/18/2014 .\" Manual: User Commands .\" Source: gnome-session .\" Language: English diff -Nru gnome-session-3.16.0/doc/man/Makefile.in gnome-session-3.18.1.2/doc/man/Makefile.in --- gnome-session-3.16.0/doc/man/Makefile.in 2015-03-23 17:27:56.000000000 +0000 +++ gnome-session-3.18.1.2/doc/man/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -237,6 +237,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru gnome-session-3.16.0/gnome-session/gnome-session.in gnome-session-3.18.1.2/gnome-session/gnome-session.in --- gnome-session-3.16.0/gnome-session/gnome-session.in 1970-01-01 00:00:00.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/gnome-session.in 2015-10-14 15:09:01.000000000 +0000 @@ -0,0 +1,15 @@ +#!/bin/sh + +SETTING=$(gsettings get org.gnome.system.locale region) +REGION=${SETTING#\'} +REGION=${REGION%\'} + +if [ -n "$REGION" ]; then + export LC_TIME=$REGION + export LC_NUMERIC=$REGION + export LC_MONETARY=$REGION + export LC_MEASUREMENT=$REGION + export LC_PAPER=$REGION +fi + +exec @libexecdir@/gnome-session-binary "$@" diff -Nru gnome-session-3.16.0/gnome-session/main.c gnome-session-3.18.1.2/gnome-session/main.c --- gnome-session-3.16.0/gnome-session/main.c 2015-02-17 19:53:01.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/main.c 2015-10-14 18:33:24.000000000 +0000 @@ -227,6 +227,43 @@ return g_spawn_check_exit_status (status, error); } +static inline void +maybe_push_env_var (const char* name) +{ + const char *value = g_getenv (name); + + if (value) + gsm_util_setenv (name, value); +} + +static void +initialize_gio (void) +{ + char *disable_fuse = NULL; + char *use_vfs = NULL; + + disable_fuse = g_strdup (g_getenv ("GVFS_DISABLE_FUSE")); + use_vfs = g_strdup (g_getenv ("GIO_USE_VFS")); + + g_setenv ("GVFS_DISABLE_FUSE", "1", TRUE); + g_setenv ("GIO_USE_VFS", "local", TRUE); + g_vfs_get_default (); + + if (use_vfs) { + g_setenv ("GIO_USE_VFS", use_vfs, TRUE); + g_free (use_vfs); + } else { + g_unsetenv ("GIO_USE_VFS"); + } + + if (disable_fuse) { + g_setenv ("GVFS_DISABLE_FUSE", use_vfs, TRUE); + g_free (disable_fuse); + } else { + g_unsetenv ("GVFS_DISABLE_FUSE"); + } +} + int main (int argc, char **argv) { @@ -254,6 +291,9 @@ gsm_util_init_error (TRUE, "%s", error->message); } + /* Make sure we initialize gio in a way that does not autostart any daemon */ + initialize_gio (); + bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); @@ -340,6 +380,26 @@ if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL) gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME"); + /* Push locale variables to dbus-daemon */ + maybe_push_env_var ("LC_TIME"); + maybe_push_env_var ("LC_NUMERIC"); + maybe_push_env_var ("LC_MONETARY"); + maybe_push_env_var ("LC_MEASUREMENT"); + maybe_push_env_var ("LC_PAPER"); + + { + gchar *ibus_path; + + ibus_path = g_find_program_in_path("ibus-daemon"); + + if (ibus_path) { + gsm_util_setenv ("QT_IM_MODULE", "ibus"); + gsm_util_setenv ("XMODIFIERS", "@im=ibus"); + } + + g_free (ibus_path); + } + /* Some third-party programs rely on GNOME_DESKTOP_SESSION_ID to * detect if GNOME is running. We keep this for compatibility reasons. */ @@ -349,6 +409,18 @@ */ gsm_util_setenv ("XDG_MENU_PREFIX", "gnome-"); + /* hack to fix keyring until we can reorder things in 3.20 + * https://bugzilla.gnome.org/show_bug.cgi?id=738205 + */ + if (g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "wayland") == 0 && + g_getenv ("GSM_SKIP_SSH_AGENT_WORKAROUND") == NULL) { + char *ssh_socket; + + ssh_socket = g_build_filename (g_get_user_runtime_dir (), "keyring", "ssh", NULL); + gsm_util_setenv ("SSH_AUTH_SOCK", ssh_socket); + g_free (ssh_socket); + } + gsm_util_set_autostart_dirs (override_autostart_dirs); session_name = opt_session_name; diff -Nru gnome-session-3.16.0/gnome-session/Makefile.am gnome-session-3.18.1.2/gnome-session/Makefile.am --- gnome-session-3.16.0/gnome-session/Makefile.am 2014-12-12 15:15:16.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/Makefile.am 2015-10-15 13:17:58.000000000 +0000 @@ -1,7 +1,7 @@ -EXTRA_DIST = +EXTRA_DIST = gnome-session.in NULL = -bin_PROGRAMS = gnome-session -libexec_PROGRAMS = gnome-session-failed +bin_SCRIPTS = gnome-session +libexec_PROGRAMS = gnome-session-binary gnome-session-failed noinst_LTLIBRARIES = libgsmutil.la noinst_PROGRAMS = \ test-client-dbus \ @@ -16,7 +16,12 @@ AM_CFLAGS = $(WARN_CFLAGS) -gnome_session_SOURCES = \ +gnome-session: gnome-session.in Makefile + $(AM_V_GEN) sed \ + -e "s|\@libexecdir\@|$(libexecdir)|" \ + $< > $@.tmp && mv $@.tmp $@ + +gnome_session_binary_SOURCES = \ $(BUILT_SOURCES) \ gsm-app.h \ gsm-app.c \ @@ -62,12 +67,12 @@ gsm-xsmp-server.h if HAVE_CONSOLEKIT -gnome_session_SOURCES += gsm-consolekit.c gsm-consolekit.h +gnome_session_binary_SOURCES += gsm-consolekit.c gsm-consolekit.h else EXTRA_DIST += gsm-consolekit.c gsm-consolekit.h endif -gnome_session_CPPFLAGS = \ +gnome_session_binary_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(X11_CFLAGS) \ $(SM_CFLAGS) \ @@ -84,7 +89,7 @@ -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \ -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" -gnome_session_LDADD = \ +gnome_session_binary_LDADD = \ libgsmutil.la \ $(X11_LIBS) \ $(SM_LIBS) \ @@ -211,6 +216,8 @@ org.gnome.SessionManager.Presence.xml CLEANFILES = \ + gnome-session \ + gnome-session.tmp \ $(BUILT_SOURCES) -include $(top_srcdir)/git.mk diff -Nru gnome-session-3.16.0/gnome-session/Makefile.in gnome-session-3.18.1.2/gnome-session/Makefile.in --- gnome-session-3.16.0/gnome-session/Makefile.in 2015-03-23 17:27:56.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -89,8 +90,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = gnome-session$(EXEEXT) -libexec_PROGRAMS = gnome-session-failed$(EXEEXT) +libexec_PROGRAMS = gnome-session-binary$(EXEEXT) \ + gnome-session-failed$(EXEEXT) noinst_PROGRAMS = test-client-dbus$(EXEEXT) test-inhibit$(EXEEXT) \ test-process-helper$(EXEEXT) @HAVE_CONSOLEKIT_TRUE@am__append_1 = gsm-consolekit.c gsm-consolekit.h @@ -118,10 +119,10 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" -PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS) -am__gnome_session_SOURCES_DIST = org.gnome.SessionManager.App.h \ - org.gnome.SessionManager.App.c \ +am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(bindir)" +PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS) +am__gnome_session_binary_SOURCES_DIST = \ + org.gnome.SessionManager.App.h org.gnome.SessionManager.App.c \ org.gnome.SessionManager.Client.h \ org.gnome.SessionManager.Client.c \ org.gnome.SessionManager.ClientPrivate.h \ @@ -145,42 +146,45 @@ gsm-shell-extensions.h gsm-shell.c gsm-shell.h \ gsm-xsmp-server.c gsm-xsmp-server.h gsm-consolekit.c \ gsm-consolekit.h -am__objects_1 = gnome_session-org.gnome.SessionManager.App.$(OBJEXT) \ - gnome_session-org.gnome.SessionManager.Client.$(OBJEXT) \ - gnome_session-org.gnome.SessionManager.ClientPrivate.$(OBJEXT) \ - gnome_session-org.gnome.SessionManager.Inhibitor.$(OBJEXT) \ - gnome_session-org.gnome.SessionManager.$(OBJEXT) \ - gnome_session-org.gnome.SessionManager.Presence.$(OBJEXT) -@HAVE_CONSOLEKIT_TRUE@am__objects_2 = \ -@HAVE_CONSOLEKIT_TRUE@ gnome_session-gsm-consolekit.$(OBJEXT) -am_gnome_session_OBJECTS = $(am__objects_1) \ - gnome_session-gsm-app.$(OBJEXT) \ - gnome_session-gsm-autostart-app.$(OBJEXT) \ - gnome_session-gsm-client.$(OBJEXT) \ - gnome_session-gsm-xsmp-client.$(OBJEXT) \ - gnome_session-gsm-dbus-client.$(OBJEXT) \ - gnome_session-gsm-fail-whale.$(OBJEXT) \ - gnome_session-gsm-system.$(OBJEXT) \ - gnome_session-gsm-systemd.$(OBJEXT) \ - gnome_session-gsm-presence.$(OBJEXT) \ - gnome_session-gdm-log.$(OBJEXT) gnome_session-main.$(OBJEXT) \ - gnome_session-gsm-store.$(OBJEXT) \ - gnome_session-gsm-inhibitor.$(OBJEXT) \ - gnome_session-gsm-manager.$(OBJEXT) \ - gnome_session-gsm-process-helper.$(OBJEXT) \ - gnome_session-gsm-session-fill.$(OBJEXT) \ - gnome_session-gsm-session-save.$(OBJEXT) \ - gnome_session-gsm-shell-extensions.$(OBJEXT) \ - gnome_session-gsm-shell.$(OBJEXT) \ - gnome_session-gsm-xsmp-server.$(OBJEXT) $(am__objects_2) -gnome_session_OBJECTS = $(am_gnome_session_OBJECTS) -gnome_session_DEPENDENCIES = libgsmutil.la $(am__DEPENDENCIES_1) \ +am__objects_1 = \ + gnome_session_binary-org.gnome.SessionManager.App.$(OBJEXT) \ + gnome_session_binary-org.gnome.SessionManager.Client.$(OBJEXT) \ + gnome_session_binary-org.gnome.SessionManager.ClientPrivate.$(OBJEXT) \ + gnome_session_binary-org.gnome.SessionManager.Inhibitor.$(OBJEXT) \ + gnome_session_binary-org.gnome.SessionManager.$(OBJEXT) \ + gnome_session_binary-org.gnome.SessionManager.Presence.$(OBJEXT) +@HAVE_CONSOLEKIT_TRUE@am__objects_2 = gnome_session_binary-gsm-consolekit.$(OBJEXT) +am_gnome_session_binary_OBJECTS = $(am__objects_1) \ + gnome_session_binary-gsm-app.$(OBJEXT) \ + gnome_session_binary-gsm-autostart-app.$(OBJEXT) \ + gnome_session_binary-gsm-client.$(OBJEXT) \ + gnome_session_binary-gsm-xsmp-client.$(OBJEXT) \ + gnome_session_binary-gsm-dbus-client.$(OBJEXT) \ + gnome_session_binary-gsm-fail-whale.$(OBJEXT) \ + gnome_session_binary-gsm-system.$(OBJEXT) \ + gnome_session_binary-gsm-systemd.$(OBJEXT) \ + gnome_session_binary-gsm-presence.$(OBJEXT) \ + gnome_session_binary-gdm-log.$(OBJEXT) \ + gnome_session_binary-main.$(OBJEXT) \ + gnome_session_binary-gsm-store.$(OBJEXT) \ + gnome_session_binary-gsm-inhibitor.$(OBJEXT) \ + gnome_session_binary-gsm-manager.$(OBJEXT) \ + gnome_session_binary-gsm-process-helper.$(OBJEXT) \ + gnome_session_binary-gsm-session-fill.$(OBJEXT) \ + gnome_session_binary-gsm-session-save.$(OBJEXT) \ + gnome_session_binary-gsm-shell-extensions.$(OBJEXT) \ + gnome_session_binary-gsm-shell.$(OBJEXT) \ + gnome_session_binary-gsm-xsmp-server.$(OBJEXT) \ + $(am__objects_2) +gnome_session_binary_OBJECTS = $(am_gnome_session_binary_OBJECTS) +gnome_session_binary_DEPENDENCIES = libgsmutil.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_gnome_session_failed_OBJECTS = \ gnome_session_failed-gsm-fail-whale-dialog.$(OBJEXT) gnome_session_failed_OBJECTS = $(am_gnome_session_failed_OBJECTS) @@ -201,6 +205,34 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(test_process_helper_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +SCRIPTS = $(bin_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -235,11 +267,11 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libgsmutil_la_SOURCES) $(gnome_session_SOURCES) \ +SOURCES = $(libgsmutil_la_SOURCES) $(gnome_session_binary_SOURCES) \ $(gnome_session_failed_SOURCES) $(test_client_dbus_SOURCES) \ $(test_inhibit_SOURCES) $(test_process_helper_SOURCES) DIST_SOURCES = $(libgsmutil_la_SOURCES) \ - $(am__gnome_session_SOURCES_DIST) \ + $(am__gnome_session_binary_SOURCES_DIST) \ $(gnome_session_failed_SOURCES) $(test_client_dbus_SOURCES) \ $(test_inhibit_SOURCES) $(test_process_helper_SOURCES) am__can_run_installinfo = \ @@ -351,6 +383,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -466,13 +499,14 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(am__append_2) README org.gnome.SessionManager.xml \ - org.gnome.SessionManager.App.xml \ +EXTRA_DIST = gnome-session.in $(am__append_2) README \ + org.gnome.SessionManager.xml org.gnome.SessionManager.App.xml \ org.gnome.SessionManager.Client.xml \ org.gnome.SessionManager.ClientPrivate.xml \ org.gnome.SessionManager.Inhibitor.xml \ org.gnome.SessionManager.Presence.xml NULL = +bin_SCRIPTS = gnome-session noinst_LTLIBRARIES = libgsmutil.la AM_CPPFLAGS = \ $(GTK3_CFLAGS) \ @@ -481,7 +515,7 @@ $(DISABLE_DEPRECATED_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS) -gnome_session_SOURCES = $(BUILT_SOURCES) gsm-app.h gsm-app.c \ +gnome_session_binary_SOURCES = $(BUILT_SOURCES) gsm-app.h gsm-app.c \ gsm-autostart-app.h gsm-autostart-app.c gsm-client.c \ gsm-client.h gsm-xsmp-client.h gsm-xsmp-client.c \ gsm-dbus-client.h gsm-dbus-client.c gsm-fail-whale.h \ @@ -495,7 +529,7 @@ gsm-session-save.c gsm-session-save.h gsm-shell-extensions.c \ gsm-shell-extensions.h gsm-shell.c gsm-shell.h \ gsm-xsmp-server.c gsm-xsmp-server.h $(am__append_1) -gnome_session_CPPFLAGS = \ +gnome_session_binary_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(X11_CFLAGS) \ $(SM_CFLAGS) \ @@ -512,7 +546,7 @@ -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \ -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" -gnome_session_LDADD = \ +gnome_session_binary_LDADD = \ libgsmutil.la \ $(X11_LIBS) \ $(SM_LIBS) \ @@ -573,6 +607,8 @@ org.gnome.SessionManager.Presence.c CLEANFILES = \ + gnome-session \ + gnome-session.tmp \ $(BUILT_SOURCES) all: $(BUILT_SOURCES) @@ -623,55 +659,6 @@ libgsmutil.la: $(libgsmutil_la_OBJECTS) $(libgsmutil_la_DEPENDENCIES) $(EXTRA_libgsmutil_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libgsmutil_la_OBJECTS) $(libgsmutil_la_LIBADD) $(LIBS) -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ @@ -731,9 +718,9 @@ echo " rm -f" $$list; \ rm -f $$list -gnome-session$(EXEEXT): $(gnome_session_OBJECTS) $(gnome_session_DEPENDENCIES) $(EXTRA_gnome_session_DEPENDENCIES) - @rm -f gnome-session$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gnome_session_OBJECTS) $(gnome_session_LDADD) $(LIBS) +gnome-session-binary$(EXEEXT): $(gnome_session_binary_OBJECTS) $(gnome_session_binary_DEPENDENCIES) $(EXTRA_gnome_session_binary_DEPENDENCIES) + @rm -f gnome-session-binary$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(gnome_session_binary_OBJECTS) $(gnome_session_binary_LDADD) $(LIBS) gnome-session-failed$(EXEEXT): $(gnome_session_failed_OBJECTS) $(gnome_session_failed_DEPENDENCIES) $(EXTRA_gnome_session_failed_DEPENDENCIES) @rm -f gnome-session-failed$(EXEEXT) @@ -750,6 +737,41 @@ test-process-helper$(EXEEXT): $(test_process_helper_OBJECTS) $(test_process_helper_DEPENDENCIES) $(EXTRA_test_process_helper_DEPENDENCIES) @rm -f test-process-helper$(EXEEXT) $(AM_V_CCLD)$(test_process_helper_LINK) $(test_process_helper_OBJECTS) $(test_process_helper_LDADD) $(LIBS) +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -757,33 +779,33 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gdm-log.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-app.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-autostart-app.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-client.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-consolekit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-dbus-client.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-fail-whale.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-inhibitor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-manager.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-presence.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-process-helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-session-fill.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-session-save.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-shell-extensions.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-shell.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-store.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-system.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-systemd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-xsmp-client.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-xsmp-server.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-org.gnome.SessionManager.App.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-org.gnome.SessionManager.Client.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-org.gnome.SessionManager.ClientPrivate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-org.gnome.SessionManager.Inhibitor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-org.gnome.SessionManager.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-org.gnome.SessionManager.Presence.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gdm-log.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-app.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-autostart-app.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-client.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-consolekit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-dbus-client.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-fail-whale.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-inhibitor.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-manager.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-presence.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-process-helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-session-fill.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-session-save.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-shell-extensions.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-shell.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-store.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-system.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-systemd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-xsmp-client.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-gsm-xsmp-server.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.App.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Client.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.ClientPrivate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Inhibitor.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Presence.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_failed-gsm-fail-whale-dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsmutil_la-gsm-util.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-client-dbus.Po@am__quote@ @@ -819,383 +841,383 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsmutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgsmutil_la-gsm-util.lo `test -f 'gsm-util.c' || echo '$(srcdir)/'`gsm-util.c -gnome_session-org.gnome.SessionManager.App.o: org.gnome.SessionManager.App.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.App.o -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.App.Tpo -c -o gnome_session-org.gnome.SessionManager.App.o `test -f 'org.gnome.SessionManager.App.c' || echo '$(srcdir)/'`org.gnome.SessionManager.App.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.App.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.App.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.App.c' object='gnome_session-org.gnome.SessionManager.App.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.App.o: org.gnome.SessionManager.App.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.App.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.App.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.App.o `test -f 'org.gnome.SessionManager.App.c' || echo '$(srcdir)/'`org.gnome.SessionManager.App.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.App.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.App.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.App.c' object='gnome_session_binary-org.gnome.SessionManager.App.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.App.o `test -f 'org.gnome.SessionManager.App.c' || echo '$(srcdir)/'`org.gnome.SessionManager.App.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.App.o `test -f 'org.gnome.SessionManager.App.c' || echo '$(srcdir)/'`org.gnome.SessionManager.App.c -gnome_session-org.gnome.SessionManager.App.obj: org.gnome.SessionManager.App.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.App.obj -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.App.Tpo -c -o gnome_session-org.gnome.SessionManager.App.obj `if test -f 'org.gnome.SessionManager.App.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.App.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.App.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.App.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.App.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.App.c' object='gnome_session-org.gnome.SessionManager.App.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.App.obj: org.gnome.SessionManager.App.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.App.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.App.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.App.obj `if test -f 'org.gnome.SessionManager.App.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.App.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.App.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.App.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.App.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.App.c' object='gnome_session_binary-org.gnome.SessionManager.App.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.App.obj `if test -f 'org.gnome.SessionManager.App.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.App.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.App.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.App.obj `if test -f 'org.gnome.SessionManager.App.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.App.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.App.c'; fi` -gnome_session-org.gnome.SessionManager.Client.o: org.gnome.SessionManager.Client.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.Client.o -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.Client.Tpo -c -o gnome_session-org.gnome.SessionManager.Client.o `test -f 'org.gnome.SessionManager.Client.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Client.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.Client.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.Client.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Client.c' object='gnome_session-org.gnome.SessionManager.Client.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.Client.o: org.gnome.SessionManager.Client.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.Client.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Client.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.Client.o `test -f 'org.gnome.SessionManager.Client.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Client.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Client.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Client.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Client.c' object='gnome_session_binary-org.gnome.SessionManager.Client.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.Client.o `test -f 'org.gnome.SessionManager.Client.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Client.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.Client.o `test -f 'org.gnome.SessionManager.Client.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Client.c -gnome_session-org.gnome.SessionManager.Client.obj: org.gnome.SessionManager.Client.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.Client.obj -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.Client.Tpo -c -o gnome_session-org.gnome.SessionManager.Client.obj `if test -f 'org.gnome.SessionManager.Client.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Client.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Client.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.Client.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.Client.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Client.c' object='gnome_session-org.gnome.SessionManager.Client.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.Client.obj: org.gnome.SessionManager.Client.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.Client.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Client.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.Client.obj `if test -f 'org.gnome.SessionManager.Client.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Client.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Client.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Client.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Client.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Client.c' object='gnome_session_binary-org.gnome.SessionManager.Client.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.Client.obj `if test -f 'org.gnome.SessionManager.Client.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Client.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Client.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.Client.obj `if test -f 'org.gnome.SessionManager.Client.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Client.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Client.c'; fi` -gnome_session-org.gnome.SessionManager.ClientPrivate.o: org.gnome.SessionManager.ClientPrivate.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.ClientPrivate.o -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.ClientPrivate.Tpo -c -o gnome_session-org.gnome.SessionManager.ClientPrivate.o `test -f 'org.gnome.SessionManager.ClientPrivate.c' || echo '$(srcdir)/'`org.gnome.SessionManager.ClientPrivate.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.ClientPrivate.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.ClientPrivate.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.ClientPrivate.c' object='gnome_session-org.gnome.SessionManager.ClientPrivate.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.ClientPrivate.o: org.gnome.SessionManager.ClientPrivate.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.ClientPrivate.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.ClientPrivate.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.ClientPrivate.o `test -f 'org.gnome.SessionManager.ClientPrivate.c' || echo '$(srcdir)/'`org.gnome.SessionManager.ClientPrivate.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.ClientPrivate.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.ClientPrivate.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.ClientPrivate.c' object='gnome_session_binary-org.gnome.SessionManager.ClientPrivate.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.ClientPrivate.o `test -f 'org.gnome.SessionManager.ClientPrivate.c' || echo '$(srcdir)/'`org.gnome.SessionManager.ClientPrivate.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.ClientPrivate.o `test -f 'org.gnome.SessionManager.ClientPrivate.c' || echo '$(srcdir)/'`org.gnome.SessionManager.ClientPrivate.c -gnome_session-org.gnome.SessionManager.ClientPrivate.obj: org.gnome.SessionManager.ClientPrivate.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.ClientPrivate.obj -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.ClientPrivate.Tpo -c -o gnome_session-org.gnome.SessionManager.ClientPrivate.obj `if test -f 'org.gnome.SessionManager.ClientPrivate.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.ClientPrivate.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.ClientPrivate.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.ClientPrivate.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.ClientPrivate.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.ClientPrivate.c' object='gnome_session-org.gnome.SessionManager.ClientPrivate.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.ClientPrivate.obj: org.gnome.SessionManager.ClientPrivate.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.ClientPrivate.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.ClientPrivate.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.ClientPrivate.obj `if test -f 'org.gnome.SessionManager.ClientPrivate.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.ClientPrivate.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.ClientPrivate.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.ClientPrivate.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.ClientPrivate.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.ClientPrivate.c' object='gnome_session_binary-org.gnome.SessionManager.ClientPrivate.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.ClientPrivate.obj `if test -f 'org.gnome.SessionManager.ClientPrivate.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.ClientPrivate.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.ClientPrivate.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.ClientPrivate.obj `if test -f 'org.gnome.SessionManager.ClientPrivate.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.ClientPrivate.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.ClientPrivate.c'; fi` -gnome_session-org.gnome.SessionManager.Inhibitor.o: org.gnome.SessionManager.Inhibitor.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.Inhibitor.o -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.Inhibitor.Tpo -c -o gnome_session-org.gnome.SessionManager.Inhibitor.o `test -f 'org.gnome.SessionManager.Inhibitor.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Inhibitor.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.Inhibitor.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.Inhibitor.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Inhibitor.c' object='gnome_session-org.gnome.SessionManager.Inhibitor.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.Inhibitor.o: org.gnome.SessionManager.Inhibitor.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.Inhibitor.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Inhibitor.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.Inhibitor.o `test -f 'org.gnome.SessionManager.Inhibitor.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Inhibitor.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Inhibitor.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Inhibitor.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Inhibitor.c' object='gnome_session_binary-org.gnome.SessionManager.Inhibitor.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.Inhibitor.o `test -f 'org.gnome.SessionManager.Inhibitor.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Inhibitor.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.Inhibitor.o `test -f 'org.gnome.SessionManager.Inhibitor.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Inhibitor.c -gnome_session-org.gnome.SessionManager.Inhibitor.obj: org.gnome.SessionManager.Inhibitor.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.Inhibitor.obj -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.Inhibitor.Tpo -c -o gnome_session-org.gnome.SessionManager.Inhibitor.obj `if test -f 'org.gnome.SessionManager.Inhibitor.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Inhibitor.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Inhibitor.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.Inhibitor.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.Inhibitor.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Inhibitor.c' object='gnome_session-org.gnome.SessionManager.Inhibitor.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.Inhibitor.obj: org.gnome.SessionManager.Inhibitor.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.Inhibitor.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Inhibitor.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.Inhibitor.obj `if test -f 'org.gnome.SessionManager.Inhibitor.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Inhibitor.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Inhibitor.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Inhibitor.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Inhibitor.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Inhibitor.c' object='gnome_session_binary-org.gnome.SessionManager.Inhibitor.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.Inhibitor.obj `if test -f 'org.gnome.SessionManager.Inhibitor.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Inhibitor.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Inhibitor.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.Inhibitor.obj `if test -f 'org.gnome.SessionManager.Inhibitor.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Inhibitor.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Inhibitor.c'; fi` -gnome_session-org.gnome.SessionManager.o: org.gnome.SessionManager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.o -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.Tpo -c -o gnome_session-org.gnome.SessionManager.o `test -f 'org.gnome.SessionManager.c' || echo '$(srcdir)/'`org.gnome.SessionManager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.c' object='gnome_session-org.gnome.SessionManager.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.o: org.gnome.SessionManager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.o `test -f 'org.gnome.SessionManager.c' || echo '$(srcdir)/'`org.gnome.SessionManager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.c' object='gnome_session_binary-org.gnome.SessionManager.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.o `test -f 'org.gnome.SessionManager.c' || echo '$(srcdir)/'`org.gnome.SessionManager.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.o `test -f 'org.gnome.SessionManager.c' || echo '$(srcdir)/'`org.gnome.SessionManager.c -gnome_session-org.gnome.SessionManager.obj: org.gnome.SessionManager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.obj -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.Tpo -c -o gnome_session-org.gnome.SessionManager.obj `if test -f 'org.gnome.SessionManager.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.c' object='gnome_session-org.gnome.SessionManager.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.obj: org.gnome.SessionManager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.obj `if test -f 'org.gnome.SessionManager.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.c' object='gnome_session_binary-org.gnome.SessionManager.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.obj `if test -f 'org.gnome.SessionManager.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.obj `if test -f 'org.gnome.SessionManager.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.c'; fi` -gnome_session-org.gnome.SessionManager.Presence.o: org.gnome.SessionManager.Presence.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.Presence.o -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.Presence.Tpo -c -o gnome_session-org.gnome.SessionManager.Presence.o `test -f 'org.gnome.SessionManager.Presence.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Presence.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.Presence.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.Presence.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Presence.c' object='gnome_session-org.gnome.SessionManager.Presence.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.Presence.o: org.gnome.SessionManager.Presence.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.Presence.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Presence.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.Presence.o `test -f 'org.gnome.SessionManager.Presence.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Presence.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Presence.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Presence.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Presence.c' object='gnome_session_binary-org.gnome.SessionManager.Presence.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.Presence.o `test -f 'org.gnome.SessionManager.Presence.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Presence.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.Presence.o `test -f 'org.gnome.SessionManager.Presence.c' || echo '$(srcdir)/'`org.gnome.SessionManager.Presence.c -gnome_session-org.gnome.SessionManager.Presence.obj: org.gnome.SessionManager.Presence.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-org.gnome.SessionManager.Presence.obj -MD -MP -MF $(DEPDIR)/gnome_session-org.gnome.SessionManager.Presence.Tpo -c -o gnome_session-org.gnome.SessionManager.Presence.obj `if test -f 'org.gnome.SessionManager.Presence.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Presence.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Presence.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-org.gnome.SessionManager.Presence.Tpo $(DEPDIR)/gnome_session-org.gnome.SessionManager.Presence.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Presence.c' object='gnome_session-org.gnome.SessionManager.Presence.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-org.gnome.SessionManager.Presence.obj: org.gnome.SessionManager.Presence.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-org.gnome.SessionManager.Presence.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Presence.Tpo -c -o gnome_session_binary-org.gnome.SessionManager.Presence.obj `if test -f 'org.gnome.SessionManager.Presence.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Presence.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Presence.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Presence.Tpo $(DEPDIR)/gnome_session_binary-org.gnome.SessionManager.Presence.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='org.gnome.SessionManager.Presence.c' object='gnome_session_binary-org.gnome.SessionManager.Presence.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-org.gnome.SessionManager.Presence.obj `if test -f 'org.gnome.SessionManager.Presence.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Presence.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Presence.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-org.gnome.SessionManager.Presence.obj `if test -f 'org.gnome.SessionManager.Presence.c'; then $(CYGPATH_W) 'org.gnome.SessionManager.Presence.c'; else $(CYGPATH_W) '$(srcdir)/org.gnome.SessionManager.Presence.c'; fi` -gnome_session-gsm-app.o: gsm-app.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-app.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-app.Tpo -c -o gnome_session-gsm-app.o `test -f 'gsm-app.c' || echo '$(srcdir)/'`gsm-app.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-app.Tpo $(DEPDIR)/gnome_session-gsm-app.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-app.c' object='gnome_session-gsm-app.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-app.o: gsm-app.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-app.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-app.Tpo -c -o gnome_session_binary-gsm-app.o `test -f 'gsm-app.c' || echo '$(srcdir)/'`gsm-app.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-app.Tpo $(DEPDIR)/gnome_session_binary-gsm-app.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-app.c' object='gnome_session_binary-gsm-app.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-app.o `test -f 'gsm-app.c' || echo '$(srcdir)/'`gsm-app.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-app.o `test -f 'gsm-app.c' || echo '$(srcdir)/'`gsm-app.c -gnome_session-gsm-app.obj: gsm-app.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-app.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-app.Tpo -c -o gnome_session-gsm-app.obj `if test -f 'gsm-app.c'; then $(CYGPATH_W) 'gsm-app.c'; else $(CYGPATH_W) '$(srcdir)/gsm-app.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-app.Tpo $(DEPDIR)/gnome_session-gsm-app.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-app.c' object='gnome_session-gsm-app.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-app.obj: gsm-app.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-app.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-app.Tpo -c -o gnome_session_binary-gsm-app.obj `if test -f 'gsm-app.c'; then $(CYGPATH_W) 'gsm-app.c'; else $(CYGPATH_W) '$(srcdir)/gsm-app.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-app.Tpo $(DEPDIR)/gnome_session_binary-gsm-app.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-app.c' object='gnome_session_binary-gsm-app.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-app.obj `if test -f 'gsm-app.c'; then $(CYGPATH_W) 'gsm-app.c'; else $(CYGPATH_W) '$(srcdir)/gsm-app.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-app.obj `if test -f 'gsm-app.c'; then $(CYGPATH_W) 'gsm-app.c'; else $(CYGPATH_W) '$(srcdir)/gsm-app.c'; fi` -gnome_session-gsm-autostart-app.o: gsm-autostart-app.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-autostart-app.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-autostart-app.Tpo -c -o gnome_session-gsm-autostart-app.o `test -f 'gsm-autostart-app.c' || echo '$(srcdir)/'`gsm-autostart-app.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-autostart-app.Tpo $(DEPDIR)/gnome_session-gsm-autostart-app.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-autostart-app.c' object='gnome_session-gsm-autostart-app.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-autostart-app.o: gsm-autostart-app.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-autostart-app.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-autostart-app.Tpo -c -o gnome_session_binary-gsm-autostart-app.o `test -f 'gsm-autostart-app.c' || echo '$(srcdir)/'`gsm-autostart-app.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-autostart-app.Tpo $(DEPDIR)/gnome_session_binary-gsm-autostart-app.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-autostart-app.c' object='gnome_session_binary-gsm-autostart-app.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-autostart-app.o `test -f 'gsm-autostart-app.c' || echo '$(srcdir)/'`gsm-autostart-app.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-autostart-app.o `test -f 'gsm-autostart-app.c' || echo '$(srcdir)/'`gsm-autostart-app.c -gnome_session-gsm-autostart-app.obj: gsm-autostart-app.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-autostart-app.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-autostart-app.Tpo -c -o gnome_session-gsm-autostart-app.obj `if test -f 'gsm-autostart-app.c'; then $(CYGPATH_W) 'gsm-autostart-app.c'; else $(CYGPATH_W) '$(srcdir)/gsm-autostart-app.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-autostart-app.Tpo $(DEPDIR)/gnome_session-gsm-autostart-app.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-autostart-app.c' object='gnome_session-gsm-autostart-app.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-autostart-app.obj: gsm-autostart-app.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-autostart-app.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-autostart-app.Tpo -c -o gnome_session_binary-gsm-autostart-app.obj `if test -f 'gsm-autostart-app.c'; then $(CYGPATH_W) 'gsm-autostart-app.c'; else $(CYGPATH_W) '$(srcdir)/gsm-autostart-app.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-autostart-app.Tpo $(DEPDIR)/gnome_session_binary-gsm-autostart-app.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-autostart-app.c' object='gnome_session_binary-gsm-autostart-app.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-autostart-app.obj `if test -f 'gsm-autostart-app.c'; then $(CYGPATH_W) 'gsm-autostart-app.c'; else $(CYGPATH_W) '$(srcdir)/gsm-autostart-app.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-autostart-app.obj `if test -f 'gsm-autostart-app.c'; then $(CYGPATH_W) 'gsm-autostart-app.c'; else $(CYGPATH_W) '$(srcdir)/gsm-autostart-app.c'; fi` -gnome_session-gsm-client.o: gsm-client.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-client.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-client.Tpo -c -o gnome_session-gsm-client.o `test -f 'gsm-client.c' || echo '$(srcdir)/'`gsm-client.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-client.Tpo $(DEPDIR)/gnome_session-gsm-client.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-client.c' object='gnome_session-gsm-client.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-client.o: gsm-client.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-client.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-client.Tpo -c -o gnome_session_binary-gsm-client.o `test -f 'gsm-client.c' || echo '$(srcdir)/'`gsm-client.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-client.Tpo $(DEPDIR)/gnome_session_binary-gsm-client.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-client.c' object='gnome_session_binary-gsm-client.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-client.o `test -f 'gsm-client.c' || echo '$(srcdir)/'`gsm-client.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-client.o `test -f 'gsm-client.c' || echo '$(srcdir)/'`gsm-client.c -gnome_session-gsm-client.obj: gsm-client.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-client.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-client.Tpo -c -o gnome_session-gsm-client.obj `if test -f 'gsm-client.c'; then $(CYGPATH_W) 'gsm-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-client.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-client.Tpo $(DEPDIR)/gnome_session-gsm-client.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-client.c' object='gnome_session-gsm-client.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-client.obj: gsm-client.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-client.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-client.Tpo -c -o gnome_session_binary-gsm-client.obj `if test -f 'gsm-client.c'; then $(CYGPATH_W) 'gsm-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-client.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-client.Tpo $(DEPDIR)/gnome_session_binary-gsm-client.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-client.c' object='gnome_session_binary-gsm-client.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-client.obj `if test -f 'gsm-client.c'; then $(CYGPATH_W) 'gsm-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-client.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-client.obj `if test -f 'gsm-client.c'; then $(CYGPATH_W) 'gsm-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-client.c'; fi` -gnome_session-gsm-xsmp-client.o: gsm-xsmp-client.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-xsmp-client.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-xsmp-client.Tpo -c -o gnome_session-gsm-xsmp-client.o `test -f 'gsm-xsmp-client.c' || echo '$(srcdir)/'`gsm-xsmp-client.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-xsmp-client.Tpo $(DEPDIR)/gnome_session-gsm-xsmp-client.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-xsmp-client.c' object='gnome_session-gsm-xsmp-client.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-xsmp-client.o: gsm-xsmp-client.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-xsmp-client.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-xsmp-client.Tpo -c -o gnome_session_binary-gsm-xsmp-client.o `test -f 'gsm-xsmp-client.c' || echo '$(srcdir)/'`gsm-xsmp-client.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-xsmp-client.Tpo $(DEPDIR)/gnome_session_binary-gsm-xsmp-client.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-xsmp-client.c' object='gnome_session_binary-gsm-xsmp-client.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-xsmp-client.o `test -f 'gsm-xsmp-client.c' || echo '$(srcdir)/'`gsm-xsmp-client.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-xsmp-client.o `test -f 'gsm-xsmp-client.c' || echo '$(srcdir)/'`gsm-xsmp-client.c -gnome_session-gsm-xsmp-client.obj: gsm-xsmp-client.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-xsmp-client.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-xsmp-client.Tpo -c -o gnome_session-gsm-xsmp-client.obj `if test -f 'gsm-xsmp-client.c'; then $(CYGPATH_W) 'gsm-xsmp-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-xsmp-client.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-xsmp-client.Tpo $(DEPDIR)/gnome_session-gsm-xsmp-client.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-xsmp-client.c' object='gnome_session-gsm-xsmp-client.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-xsmp-client.obj: gsm-xsmp-client.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-xsmp-client.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-xsmp-client.Tpo -c -o gnome_session_binary-gsm-xsmp-client.obj `if test -f 'gsm-xsmp-client.c'; then $(CYGPATH_W) 'gsm-xsmp-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-xsmp-client.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-xsmp-client.Tpo $(DEPDIR)/gnome_session_binary-gsm-xsmp-client.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-xsmp-client.c' object='gnome_session_binary-gsm-xsmp-client.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-xsmp-client.obj `if test -f 'gsm-xsmp-client.c'; then $(CYGPATH_W) 'gsm-xsmp-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-xsmp-client.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-xsmp-client.obj `if test -f 'gsm-xsmp-client.c'; then $(CYGPATH_W) 'gsm-xsmp-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-xsmp-client.c'; fi` -gnome_session-gsm-dbus-client.o: gsm-dbus-client.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-dbus-client.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-dbus-client.Tpo -c -o gnome_session-gsm-dbus-client.o `test -f 'gsm-dbus-client.c' || echo '$(srcdir)/'`gsm-dbus-client.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-dbus-client.Tpo $(DEPDIR)/gnome_session-gsm-dbus-client.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-dbus-client.c' object='gnome_session-gsm-dbus-client.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-dbus-client.o: gsm-dbus-client.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-dbus-client.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-dbus-client.Tpo -c -o gnome_session_binary-gsm-dbus-client.o `test -f 'gsm-dbus-client.c' || echo '$(srcdir)/'`gsm-dbus-client.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-dbus-client.Tpo $(DEPDIR)/gnome_session_binary-gsm-dbus-client.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-dbus-client.c' object='gnome_session_binary-gsm-dbus-client.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-dbus-client.o `test -f 'gsm-dbus-client.c' || echo '$(srcdir)/'`gsm-dbus-client.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-dbus-client.o `test -f 'gsm-dbus-client.c' || echo '$(srcdir)/'`gsm-dbus-client.c -gnome_session-gsm-dbus-client.obj: gsm-dbus-client.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-dbus-client.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-dbus-client.Tpo -c -o gnome_session-gsm-dbus-client.obj `if test -f 'gsm-dbus-client.c'; then $(CYGPATH_W) 'gsm-dbus-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-dbus-client.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-dbus-client.Tpo $(DEPDIR)/gnome_session-gsm-dbus-client.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-dbus-client.c' object='gnome_session-gsm-dbus-client.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-dbus-client.obj: gsm-dbus-client.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-dbus-client.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-dbus-client.Tpo -c -o gnome_session_binary-gsm-dbus-client.obj `if test -f 'gsm-dbus-client.c'; then $(CYGPATH_W) 'gsm-dbus-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-dbus-client.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-dbus-client.Tpo $(DEPDIR)/gnome_session_binary-gsm-dbus-client.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-dbus-client.c' object='gnome_session_binary-gsm-dbus-client.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-dbus-client.obj `if test -f 'gsm-dbus-client.c'; then $(CYGPATH_W) 'gsm-dbus-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-dbus-client.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-dbus-client.obj `if test -f 'gsm-dbus-client.c'; then $(CYGPATH_W) 'gsm-dbus-client.c'; else $(CYGPATH_W) '$(srcdir)/gsm-dbus-client.c'; fi` -gnome_session-gsm-fail-whale.o: gsm-fail-whale.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-fail-whale.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-fail-whale.Tpo -c -o gnome_session-gsm-fail-whale.o `test -f 'gsm-fail-whale.c' || echo '$(srcdir)/'`gsm-fail-whale.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-fail-whale.Tpo $(DEPDIR)/gnome_session-gsm-fail-whale.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-fail-whale.c' object='gnome_session-gsm-fail-whale.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-fail-whale.o: gsm-fail-whale.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-fail-whale.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-fail-whale.Tpo -c -o gnome_session_binary-gsm-fail-whale.o `test -f 'gsm-fail-whale.c' || echo '$(srcdir)/'`gsm-fail-whale.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-fail-whale.Tpo $(DEPDIR)/gnome_session_binary-gsm-fail-whale.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-fail-whale.c' object='gnome_session_binary-gsm-fail-whale.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-fail-whale.o `test -f 'gsm-fail-whale.c' || echo '$(srcdir)/'`gsm-fail-whale.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-fail-whale.o `test -f 'gsm-fail-whale.c' || echo '$(srcdir)/'`gsm-fail-whale.c -gnome_session-gsm-fail-whale.obj: gsm-fail-whale.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-fail-whale.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-fail-whale.Tpo -c -o gnome_session-gsm-fail-whale.obj `if test -f 'gsm-fail-whale.c'; then $(CYGPATH_W) 'gsm-fail-whale.c'; else $(CYGPATH_W) '$(srcdir)/gsm-fail-whale.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-fail-whale.Tpo $(DEPDIR)/gnome_session-gsm-fail-whale.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-fail-whale.c' object='gnome_session-gsm-fail-whale.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-fail-whale.obj: gsm-fail-whale.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-fail-whale.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-fail-whale.Tpo -c -o gnome_session_binary-gsm-fail-whale.obj `if test -f 'gsm-fail-whale.c'; then $(CYGPATH_W) 'gsm-fail-whale.c'; else $(CYGPATH_W) '$(srcdir)/gsm-fail-whale.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-fail-whale.Tpo $(DEPDIR)/gnome_session_binary-gsm-fail-whale.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-fail-whale.c' object='gnome_session_binary-gsm-fail-whale.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-fail-whale.obj `if test -f 'gsm-fail-whale.c'; then $(CYGPATH_W) 'gsm-fail-whale.c'; else $(CYGPATH_W) '$(srcdir)/gsm-fail-whale.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-fail-whale.obj `if test -f 'gsm-fail-whale.c'; then $(CYGPATH_W) 'gsm-fail-whale.c'; else $(CYGPATH_W) '$(srcdir)/gsm-fail-whale.c'; fi` -gnome_session-gsm-system.o: gsm-system.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-system.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-system.Tpo -c -o gnome_session-gsm-system.o `test -f 'gsm-system.c' || echo '$(srcdir)/'`gsm-system.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-system.Tpo $(DEPDIR)/gnome_session-gsm-system.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-system.c' object='gnome_session-gsm-system.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-system.o: gsm-system.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-system.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-system.Tpo -c -o gnome_session_binary-gsm-system.o `test -f 'gsm-system.c' || echo '$(srcdir)/'`gsm-system.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-system.Tpo $(DEPDIR)/gnome_session_binary-gsm-system.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-system.c' object='gnome_session_binary-gsm-system.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-system.o `test -f 'gsm-system.c' || echo '$(srcdir)/'`gsm-system.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-system.o `test -f 'gsm-system.c' || echo '$(srcdir)/'`gsm-system.c -gnome_session-gsm-system.obj: gsm-system.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-system.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-system.Tpo -c -o gnome_session-gsm-system.obj `if test -f 'gsm-system.c'; then $(CYGPATH_W) 'gsm-system.c'; else $(CYGPATH_W) '$(srcdir)/gsm-system.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-system.Tpo $(DEPDIR)/gnome_session-gsm-system.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-system.c' object='gnome_session-gsm-system.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-system.obj: gsm-system.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-system.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-system.Tpo -c -o gnome_session_binary-gsm-system.obj `if test -f 'gsm-system.c'; then $(CYGPATH_W) 'gsm-system.c'; else $(CYGPATH_W) '$(srcdir)/gsm-system.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-system.Tpo $(DEPDIR)/gnome_session_binary-gsm-system.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-system.c' object='gnome_session_binary-gsm-system.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-system.obj `if test -f 'gsm-system.c'; then $(CYGPATH_W) 'gsm-system.c'; else $(CYGPATH_W) '$(srcdir)/gsm-system.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-system.obj `if test -f 'gsm-system.c'; then $(CYGPATH_W) 'gsm-system.c'; else $(CYGPATH_W) '$(srcdir)/gsm-system.c'; fi` -gnome_session-gsm-systemd.o: gsm-systemd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-systemd.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-systemd.Tpo -c -o gnome_session-gsm-systemd.o `test -f 'gsm-systemd.c' || echo '$(srcdir)/'`gsm-systemd.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-systemd.Tpo $(DEPDIR)/gnome_session-gsm-systemd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-systemd.c' object='gnome_session-gsm-systemd.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-systemd.o: gsm-systemd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-systemd.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-systemd.Tpo -c -o gnome_session_binary-gsm-systemd.o `test -f 'gsm-systemd.c' || echo '$(srcdir)/'`gsm-systemd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-systemd.Tpo $(DEPDIR)/gnome_session_binary-gsm-systemd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-systemd.c' object='gnome_session_binary-gsm-systemd.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-systemd.o `test -f 'gsm-systemd.c' || echo '$(srcdir)/'`gsm-systemd.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-systemd.o `test -f 'gsm-systemd.c' || echo '$(srcdir)/'`gsm-systemd.c -gnome_session-gsm-systemd.obj: gsm-systemd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-systemd.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-systemd.Tpo -c -o gnome_session-gsm-systemd.obj `if test -f 'gsm-systemd.c'; then $(CYGPATH_W) 'gsm-systemd.c'; else $(CYGPATH_W) '$(srcdir)/gsm-systemd.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-systemd.Tpo $(DEPDIR)/gnome_session-gsm-systemd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-systemd.c' object='gnome_session-gsm-systemd.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-systemd.obj: gsm-systemd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-systemd.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-systemd.Tpo -c -o gnome_session_binary-gsm-systemd.obj `if test -f 'gsm-systemd.c'; then $(CYGPATH_W) 'gsm-systemd.c'; else $(CYGPATH_W) '$(srcdir)/gsm-systemd.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-systemd.Tpo $(DEPDIR)/gnome_session_binary-gsm-systemd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-systemd.c' object='gnome_session_binary-gsm-systemd.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-systemd.obj `if test -f 'gsm-systemd.c'; then $(CYGPATH_W) 'gsm-systemd.c'; else $(CYGPATH_W) '$(srcdir)/gsm-systemd.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-systemd.obj `if test -f 'gsm-systemd.c'; then $(CYGPATH_W) 'gsm-systemd.c'; else $(CYGPATH_W) '$(srcdir)/gsm-systemd.c'; fi` -gnome_session-gsm-presence.o: gsm-presence.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-presence.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-presence.Tpo -c -o gnome_session-gsm-presence.o `test -f 'gsm-presence.c' || echo '$(srcdir)/'`gsm-presence.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-presence.Tpo $(DEPDIR)/gnome_session-gsm-presence.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-presence.c' object='gnome_session-gsm-presence.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-presence.o: gsm-presence.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-presence.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-presence.Tpo -c -o gnome_session_binary-gsm-presence.o `test -f 'gsm-presence.c' || echo '$(srcdir)/'`gsm-presence.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-presence.Tpo $(DEPDIR)/gnome_session_binary-gsm-presence.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-presence.c' object='gnome_session_binary-gsm-presence.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-presence.o `test -f 'gsm-presence.c' || echo '$(srcdir)/'`gsm-presence.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-presence.o `test -f 'gsm-presence.c' || echo '$(srcdir)/'`gsm-presence.c -gnome_session-gsm-presence.obj: gsm-presence.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-presence.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-presence.Tpo -c -o gnome_session-gsm-presence.obj `if test -f 'gsm-presence.c'; then $(CYGPATH_W) 'gsm-presence.c'; else $(CYGPATH_W) '$(srcdir)/gsm-presence.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-presence.Tpo $(DEPDIR)/gnome_session-gsm-presence.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-presence.c' object='gnome_session-gsm-presence.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-presence.obj: gsm-presence.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-presence.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-presence.Tpo -c -o gnome_session_binary-gsm-presence.obj `if test -f 'gsm-presence.c'; then $(CYGPATH_W) 'gsm-presence.c'; else $(CYGPATH_W) '$(srcdir)/gsm-presence.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-presence.Tpo $(DEPDIR)/gnome_session_binary-gsm-presence.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-presence.c' object='gnome_session_binary-gsm-presence.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-presence.obj `if test -f 'gsm-presence.c'; then $(CYGPATH_W) 'gsm-presence.c'; else $(CYGPATH_W) '$(srcdir)/gsm-presence.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-presence.obj `if test -f 'gsm-presence.c'; then $(CYGPATH_W) 'gsm-presence.c'; else $(CYGPATH_W) '$(srcdir)/gsm-presence.c'; fi` -gnome_session-gdm-log.o: gdm-log.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gdm-log.o -MD -MP -MF $(DEPDIR)/gnome_session-gdm-log.Tpo -c -o gnome_session-gdm-log.o `test -f 'gdm-log.c' || echo '$(srcdir)/'`gdm-log.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gdm-log.Tpo $(DEPDIR)/gnome_session-gdm-log.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gdm-log.c' object='gnome_session-gdm-log.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gdm-log.o: gdm-log.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gdm-log.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gdm-log.Tpo -c -o gnome_session_binary-gdm-log.o `test -f 'gdm-log.c' || echo '$(srcdir)/'`gdm-log.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gdm-log.Tpo $(DEPDIR)/gnome_session_binary-gdm-log.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gdm-log.c' object='gnome_session_binary-gdm-log.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gdm-log.o `test -f 'gdm-log.c' || echo '$(srcdir)/'`gdm-log.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gdm-log.o `test -f 'gdm-log.c' || echo '$(srcdir)/'`gdm-log.c -gnome_session-gdm-log.obj: gdm-log.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gdm-log.obj -MD -MP -MF $(DEPDIR)/gnome_session-gdm-log.Tpo -c -o gnome_session-gdm-log.obj `if test -f 'gdm-log.c'; then $(CYGPATH_W) 'gdm-log.c'; else $(CYGPATH_W) '$(srcdir)/gdm-log.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gdm-log.Tpo $(DEPDIR)/gnome_session-gdm-log.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gdm-log.c' object='gnome_session-gdm-log.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gdm-log.obj: gdm-log.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gdm-log.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gdm-log.Tpo -c -o gnome_session_binary-gdm-log.obj `if test -f 'gdm-log.c'; then $(CYGPATH_W) 'gdm-log.c'; else $(CYGPATH_W) '$(srcdir)/gdm-log.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gdm-log.Tpo $(DEPDIR)/gnome_session_binary-gdm-log.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gdm-log.c' object='gnome_session_binary-gdm-log.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gdm-log.obj `if test -f 'gdm-log.c'; then $(CYGPATH_W) 'gdm-log.c'; else $(CYGPATH_W) '$(srcdir)/gdm-log.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gdm-log.obj `if test -f 'gdm-log.c'; then $(CYGPATH_W) 'gdm-log.c'; else $(CYGPATH_W) '$(srcdir)/gdm-log.c'; fi` -gnome_session-main.o: main.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-main.o -MD -MP -MF $(DEPDIR)/gnome_session-main.Tpo -c -o gnome_session-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-main.Tpo $(DEPDIR)/gnome_session-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='gnome_session-main.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-main.o: main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-main.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-main.Tpo -c -o gnome_session_binary-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-main.Tpo $(DEPDIR)/gnome_session_binary-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='gnome_session_binary-main.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c -gnome_session-main.obj: main.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-main.obj -MD -MP -MF $(DEPDIR)/gnome_session-main.Tpo -c -o gnome_session-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-main.Tpo $(DEPDIR)/gnome_session-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='gnome_session-main.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-main.obj: main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-main.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-main.Tpo -c -o gnome_session_binary-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-main.Tpo $(DEPDIR)/gnome_session_binary-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='gnome_session_binary-main.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` -gnome_session-gsm-store.o: gsm-store.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-store.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-store.Tpo -c -o gnome_session-gsm-store.o `test -f 'gsm-store.c' || echo '$(srcdir)/'`gsm-store.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-store.Tpo $(DEPDIR)/gnome_session-gsm-store.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-store.c' object='gnome_session-gsm-store.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-store.o: gsm-store.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-store.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-store.Tpo -c -o gnome_session_binary-gsm-store.o `test -f 'gsm-store.c' || echo '$(srcdir)/'`gsm-store.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-store.Tpo $(DEPDIR)/gnome_session_binary-gsm-store.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-store.c' object='gnome_session_binary-gsm-store.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-store.o `test -f 'gsm-store.c' || echo '$(srcdir)/'`gsm-store.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-store.o `test -f 'gsm-store.c' || echo '$(srcdir)/'`gsm-store.c -gnome_session-gsm-store.obj: gsm-store.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-store.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-store.Tpo -c -o gnome_session-gsm-store.obj `if test -f 'gsm-store.c'; then $(CYGPATH_W) 'gsm-store.c'; else $(CYGPATH_W) '$(srcdir)/gsm-store.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-store.Tpo $(DEPDIR)/gnome_session-gsm-store.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-store.c' object='gnome_session-gsm-store.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-store.obj: gsm-store.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-store.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-store.Tpo -c -o gnome_session_binary-gsm-store.obj `if test -f 'gsm-store.c'; then $(CYGPATH_W) 'gsm-store.c'; else $(CYGPATH_W) '$(srcdir)/gsm-store.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-store.Tpo $(DEPDIR)/gnome_session_binary-gsm-store.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-store.c' object='gnome_session_binary-gsm-store.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-store.obj `if test -f 'gsm-store.c'; then $(CYGPATH_W) 'gsm-store.c'; else $(CYGPATH_W) '$(srcdir)/gsm-store.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-store.obj `if test -f 'gsm-store.c'; then $(CYGPATH_W) 'gsm-store.c'; else $(CYGPATH_W) '$(srcdir)/gsm-store.c'; fi` -gnome_session-gsm-inhibitor.o: gsm-inhibitor.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-inhibitor.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-inhibitor.Tpo -c -o gnome_session-gsm-inhibitor.o `test -f 'gsm-inhibitor.c' || echo '$(srcdir)/'`gsm-inhibitor.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-inhibitor.Tpo $(DEPDIR)/gnome_session-gsm-inhibitor.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-inhibitor.c' object='gnome_session-gsm-inhibitor.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-inhibitor.o: gsm-inhibitor.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-inhibitor.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-inhibitor.Tpo -c -o gnome_session_binary-gsm-inhibitor.o `test -f 'gsm-inhibitor.c' || echo '$(srcdir)/'`gsm-inhibitor.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-inhibitor.Tpo $(DEPDIR)/gnome_session_binary-gsm-inhibitor.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-inhibitor.c' object='gnome_session_binary-gsm-inhibitor.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-inhibitor.o `test -f 'gsm-inhibitor.c' || echo '$(srcdir)/'`gsm-inhibitor.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-inhibitor.o `test -f 'gsm-inhibitor.c' || echo '$(srcdir)/'`gsm-inhibitor.c -gnome_session-gsm-inhibitor.obj: gsm-inhibitor.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-inhibitor.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-inhibitor.Tpo -c -o gnome_session-gsm-inhibitor.obj `if test -f 'gsm-inhibitor.c'; then $(CYGPATH_W) 'gsm-inhibitor.c'; else $(CYGPATH_W) '$(srcdir)/gsm-inhibitor.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-inhibitor.Tpo $(DEPDIR)/gnome_session-gsm-inhibitor.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-inhibitor.c' object='gnome_session-gsm-inhibitor.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-inhibitor.obj: gsm-inhibitor.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-inhibitor.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-inhibitor.Tpo -c -o gnome_session_binary-gsm-inhibitor.obj `if test -f 'gsm-inhibitor.c'; then $(CYGPATH_W) 'gsm-inhibitor.c'; else $(CYGPATH_W) '$(srcdir)/gsm-inhibitor.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-inhibitor.Tpo $(DEPDIR)/gnome_session_binary-gsm-inhibitor.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-inhibitor.c' object='gnome_session_binary-gsm-inhibitor.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-inhibitor.obj `if test -f 'gsm-inhibitor.c'; then $(CYGPATH_W) 'gsm-inhibitor.c'; else $(CYGPATH_W) '$(srcdir)/gsm-inhibitor.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-inhibitor.obj `if test -f 'gsm-inhibitor.c'; then $(CYGPATH_W) 'gsm-inhibitor.c'; else $(CYGPATH_W) '$(srcdir)/gsm-inhibitor.c'; fi` -gnome_session-gsm-manager.o: gsm-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-manager.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-manager.Tpo -c -o gnome_session-gsm-manager.o `test -f 'gsm-manager.c' || echo '$(srcdir)/'`gsm-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-manager.Tpo $(DEPDIR)/gnome_session-gsm-manager.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-manager.c' object='gnome_session-gsm-manager.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-manager.o: gsm-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-manager.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-manager.Tpo -c -o gnome_session_binary-gsm-manager.o `test -f 'gsm-manager.c' || echo '$(srcdir)/'`gsm-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-manager.Tpo $(DEPDIR)/gnome_session_binary-gsm-manager.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-manager.c' object='gnome_session_binary-gsm-manager.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-manager.o `test -f 'gsm-manager.c' || echo '$(srcdir)/'`gsm-manager.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-manager.o `test -f 'gsm-manager.c' || echo '$(srcdir)/'`gsm-manager.c -gnome_session-gsm-manager.obj: gsm-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-manager.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-manager.Tpo -c -o gnome_session-gsm-manager.obj `if test -f 'gsm-manager.c'; then $(CYGPATH_W) 'gsm-manager.c'; else $(CYGPATH_W) '$(srcdir)/gsm-manager.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-manager.Tpo $(DEPDIR)/gnome_session-gsm-manager.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-manager.c' object='gnome_session-gsm-manager.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-manager.obj: gsm-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-manager.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-manager.Tpo -c -o gnome_session_binary-gsm-manager.obj `if test -f 'gsm-manager.c'; then $(CYGPATH_W) 'gsm-manager.c'; else $(CYGPATH_W) '$(srcdir)/gsm-manager.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-manager.Tpo $(DEPDIR)/gnome_session_binary-gsm-manager.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-manager.c' object='gnome_session_binary-gsm-manager.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-manager.obj `if test -f 'gsm-manager.c'; then $(CYGPATH_W) 'gsm-manager.c'; else $(CYGPATH_W) '$(srcdir)/gsm-manager.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-manager.obj `if test -f 'gsm-manager.c'; then $(CYGPATH_W) 'gsm-manager.c'; else $(CYGPATH_W) '$(srcdir)/gsm-manager.c'; fi` -gnome_session-gsm-process-helper.o: gsm-process-helper.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-process-helper.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-process-helper.Tpo -c -o gnome_session-gsm-process-helper.o `test -f 'gsm-process-helper.c' || echo '$(srcdir)/'`gsm-process-helper.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-process-helper.Tpo $(DEPDIR)/gnome_session-gsm-process-helper.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-process-helper.c' object='gnome_session-gsm-process-helper.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-process-helper.o: gsm-process-helper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-process-helper.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-process-helper.Tpo -c -o gnome_session_binary-gsm-process-helper.o `test -f 'gsm-process-helper.c' || echo '$(srcdir)/'`gsm-process-helper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-process-helper.Tpo $(DEPDIR)/gnome_session_binary-gsm-process-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-process-helper.c' object='gnome_session_binary-gsm-process-helper.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-process-helper.o `test -f 'gsm-process-helper.c' || echo '$(srcdir)/'`gsm-process-helper.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-process-helper.o `test -f 'gsm-process-helper.c' || echo '$(srcdir)/'`gsm-process-helper.c -gnome_session-gsm-process-helper.obj: gsm-process-helper.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-process-helper.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-process-helper.Tpo -c -o gnome_session-gsm-process-helper.obj `if test -f 'gsm-process-helper.c'; then $(CYGPATH_W) 'gsm-process-helper.c'; else $(CYGPATH_W) '$(srcdir)/gsm-process-helper.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-process-helper.Tpo $(DEPDIR)/gnome_session-gsm-process-helper.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-process-helper.c' object='gnome_session-gsm-process-helper.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-process-helper.obj: gsm-process-helper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-process-helper.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-process-helper.Tpo -c -o gnome_session_binary-gsm-process-helper.obj `if test -f 'gsm-process-helper.c'; then $(CYGPATH_W) 'gsm-process-helper.c'; else $(CYGPATH_W) '$(srcdir)/gsm-process-helper.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-process-helper.Tpo $(DEPDIR)/gnome_session_binary-gsm-process-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-process-helper.c' object='gnome_session_binary-gsm-process-helper.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-process-helper.obj `if test -f 'gsm-process-helper.c'; then $(CYGPATH_W) 'gsm-process-helper.c'; else $(CYGPATH_W) '$(srcdir)/gsm-process-helper.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-process-helper.obj `if test -f 'gsm-process-helper.c'; then $(CYGPATH_W) 'gsm-process-helper.c'; else $(CYGPATH_W) '$(srcdir)/gsm-process-helper.c'; fi` -gnome_session-gsm-session-fill.o: gsm-session-fill.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-session-fill.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-session-fill.Tpo -c -o gnome_session-gsm-session-fill.o `test -f 'gsm-session-fill.c' || echo '$(srcdir)/'`gsm-session-fill.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-session-fill.Tpo $(DEPDIR)/gnome_session-gsm-session-fill.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-session-fill.c' object='gnome_session-gsm-session-fill.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-session-fill.o: gsm-session-fill.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-session-fill.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-session-fill.Tpo -c -o gnome_session_binary-gsm-session-fill.o `test -f 'gsm-session-fill.c' || echo '$(srcdir)/'`gsm-session-fill.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-session-fill.Tpo $(DEPDIR)/gnome_session_binary-gsm-session-fill.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-session-fill.c' object='gnome_session_binary-gsm-session-fill.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-session-fill.o `test -f 'gsm-session-fill.c' || echo '$(srcdir)/'`gsm-session-fill.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-session-fill.o `test -f 'gsm-session-fill.c' || echo '$(srcdir)/'`gsm-session-fill.c -gnome_session-gsm-session-fill.obj: gsm-session-fill.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-session-fill.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-session-fill.Tpo -c -o gnome_session-gsm-session-fill.obj `if test -f 'gsm-session-fill.c'; then $(CYGPATH_W) 'gsm-session-fill.c'; else $(CYGPATH_W) '$(srcdir)/gsm-session-fill.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-session-fill.Tpo $(DEPDIR)/gnome_session-gsm-session-fill.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-session-fill.c' object='gnome_session-gsm-session-fill.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-session-fill.obj: gsm-session-fill.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-session-fill.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-session-fill.Tpo -c -o gnome_session_binary-gsm-session-fill.obj `if test -f 'gsm-session-fill.c'; then $(CYGPATH_W) 'gsm-session-fill.c'; else $(CYGPATH_W) '$(srcdir)/gsm-session-fill.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-session-fill.Tpo $(DEPDIR)/gnome_session_binary-gsm-session-fill.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-session-fill.c' object='gnome_session_binary-gsm-session-fill.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-session-fill.obj `if test -f 'gsm-session-fill.c'; then $(CYGPATH_W) 'gsm-session-fill.c'; else $(CYGPATH_W) '$(srcdir)/gsm-session-fill.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-session-fill.obj `if test -f 'gsm-session-fill.c'; then $(CYGPATH_W) 'gsm-session-fill.c'; else $(CYGPATH_W) '$(srcdir)/gsm-session-fill.c'; fi` -gnome_session-gsm-session-save.o: gsm-session-save.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-session-save.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-session-save.Tpo -c -o gnome_session-gsm-session-save.o `test -f 'gsm-session-save.c' || echo '$(srcdir)/'`gsm-session-save.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-session-save.Tpo $(DEPDIR)/gnome_session-gsm-session-save.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-session-save.c' object='gnome_session-gsm-session-save.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-session-save.o: gsm-session-save.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-session-save.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-session-save.Tpo -c -o gnome_session_binary-gsm-session-save.o `test -f 'gsm-session-save.c' || echo '$(srcdir)/'`gsm-session-save.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-session-save.Tpo $(DEPDIR)/gnome_session_binary-gsm-session-save.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-session-save.c' object='gnome_session_binary-gsm-session-save.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-session-save.o `test -f 'gsm-session-save.c' || echo '$(srcdir)/'`gsm-session-save.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-session-save.o `test -f 'gsm-session-save.c' || echo '$(srcdir)/'`gsm-session-save.c -gnome_session-gsm-session-save.obj: gsm-session-save.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-session-save.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-session-save.Tpo -c -o gnome_session-gsm-session-save.obj `if test -f 'gsm-session-save.c'; then $(CYGPATH_W) 'gsm-session-save.c'; else $(CYGPATH_W) '$(srcdir)/gsm-session-save.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-session-save.Tpo $(DEPDIR)/gnome_session-gsm-session-save.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-session-save.c' object='gnome_session-gsm-session-save.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-session-save.obj: gsm-session-save.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-session-save.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-session-save.Tpo -c -o gnome_session_binary-gsm-session-save.obj `if test -f 'gsm-session-save.c'; then $(CYGPATH_W) 'gsm-session-save.c'; else $(CYGPATH_W) '$(srcdir)/gsm-session-save.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-session-save.Tpo $(DEPDIR)/gnome_session_binary-gsm-session-save.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-session-save.c' object='gnome_session_binary-gsm-session-save.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-session-save.obj `if test -f 'gsm-session-save.c'; then $(CYGPATH_W) 'gsm-session-save.c'; else $(CYGPATH_W) '$(srcdir)/gsm-session-save.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-session-save.obj `if test -f 'gsm-session-save.c'; then $(CYGPATH_W) 'gsm-session-save.c'; else $(CYGPATH_W) '$(srcdir)/gsm-session-save.c'; fi` -gnome_session-gsm-shell-extensions.o: gsm-shell-extensions.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-shell-extensions.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-shell-extensions.Tpo -c -o gnome_session-gsm-shell-extensions.o `test -f 'gsm-shell-extensions.c' || echo '$(srcdir)/'`gsm-shell-extensions.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-shell-extensions.Tpo $(DEPDIR)/gnome_session-gsm-shell-extensions.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-shell-extensions.c' object='gnome_session-gsm-shell-extensions.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-shell-extensions.o: gsm-shell-extensions.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-shell-extensions.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-shell-extensions.Tpo -c -o gnome_session_binary-gsm-shell-extensions.o `test -f 'gsm-shell-extensions.c' || echo '$(srcdir)/'`gsm-shell-extensions.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-shell-extensions.Tpo $(DEPDIR)/gnome_session_binary-gsm-shell-extensions.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-shell-extensions.c' object='gnome_session_binary-gsm-shell-extensions.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-shell-extensions.o `test -f 'gsm-shell-extensions.c' || echo '$(srcdir)/'`gsm-shell-extensions.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-shell-extensions.o `test -f 'gsm-shell-extensions.c' || echo '$(srcdir)/'`gsm-shell-extensions.c -gnome_session-gsm-shell-extensions.obj: gsm-shell-extensions.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-shell-extensions.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-shell-extensions.Tpo -c -o gnome_session-gsm-shell-extensions.obj `if test -f 'gsm-shell-extensions.c'; then $(CYGPATH_W) 'gsm-shell-extensions.c'; else $(CYGPATH_W) '$(srcdir)/gsm-shell-extensions.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-shell-extensions.Tpo $(DEPDIR)/gnome_session-gsm-shell-extensions.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-shell-extensions.c' object='gnome_session-gsm-shell-extensions.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-shell-extensions.obj: gsm-shell-extensions.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-shell-extensions.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-shell-extensions.Tpo -c -o gnome_session_binary-gsm-shell-extensions.obj `if test -f 'gsm-shell-extensions.c'; then $(CYGPATH_W) 'gsm-shell-extensions.c'; else $(CYGPATH_W) '$(srcdir)/gsm-shell-extensions.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-shell-extensions.Tpo $(DEPDIR)/gnome_session_binary-gsm-shell-extensions.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-shell-extensions.c' object='gnome_session_binary-gsm-shell-extensions.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-shell-extensions.obj `if test -f 'gsm-shell-extensions.c'; then $(CYGPATH_W) 'gsm-shell-extensions.c'; else $(CYGPATH_W) '$(srcdir)/gsm-shell-extensions.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-shell-extensions.obj `if test -f 'gsm-shell-extensions.c'; then $(CYGPATH_W) 'gsm-shell-extensions.c'; else $(CYGPATH_W) '$(srcdir)/gsm-shell-extensions.c'; fi` -gnome_session-gsm-shell.o: gsm-shell.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-shell.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-shell.Tpo -c -o gnome_session-gsm-shell.o `test -f 'gsm-shell.c' || echo '$(srcdir)/'`gsm-shell.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-shell.Tpo $(DEPDIR)/gnome_session-gsm-shell.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-shell.c' object='gnome_session-gsm-shell.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-shell.o: gsm-shell.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-shell.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-shell.Tpo -c -o gnome_session_binary-gsm-shell.o `test -f 'gsm-shell.c' || echo '$(srcdir)/'`gsm-shell.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-shell.Tpo $(DEPDIR)/gnome_session_binary-gsm-shell.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-shell.c' object='gnome_session_binary-gsm-shell.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-shell.o `test -f 'gsm-shell.c' || echo '$(srcdir)/'`gsm-shell.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-shell.o `test -f 'gsm-shell.c' || echo '$(srcdir)/'`gsm-shell.c -gnome_session-gsm-shell.obj: gsm-shell.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-shell.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-shell.Tpo -c -o gnome_session-gsm-shell.obj `if test -f 'gsm-shell.c'; then $(CYGPATH_W) 'gsm-shell.c'; else $(CYGPATH_W) '$(srcdir)/gsm-shell.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-shell.Tpo $(DEPDIR)/gnome_session-gsm-shell.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-shell.c' object='gnome_session-gsm-shell.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-shell.obj: gsm-shell.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-shell.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-shell.Tpo -c -o gnome_session_binary-gsm-shell.obj `if test -f 'gsm-shell.c'; then $(CYGPATH_W) 'gsm-shell.c'; else $(CYGPATH_W) '$(srcdir)/gsm-shell.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-shell.Tpo $(DEPDIR)/gnome_session_binary-gsm-shell.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-shell.c' object='gnome_session_binary-gsm-shell.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-shell.obj `if test -f 'gsm-shell.c'; then $(CYGPATH_W) 'gsm-shell.c'; else $(CYGPATH_W) '$(srcdir)/gsm-shell.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-shell.obj `if test -f 'gsm-shell.c'; then $(CYGPATH_W) 'gsm-shell.c'; else $(CYGPATH_W) '$(srcdir)/gsm-shell.c'; fi` -gnome_session-gsm-xsmp-server.o: gsm-xsmp-server.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-xsmp-server.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-xsmp-server.Tpo -c -o gnome_session-gsm-xsmp-server.o `test -f 'gsm-xsmp-server.c' || echo '$(srcdir)/'`gsm-xsmp-server.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-xsmp-server.Tpo $(DEPDIR)/gnome_session-gsm-xsmp-server.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-xsmp-server.c' object='gnome_session-gsm-xsmp-server.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-xsmp-server.o: gsm-xsmp-server.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-xsmp-server.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-xsmp-server.Tpo -c -o gnome_session_binary-gsm-xsmp-server.o `test -f 'gsm-xsmp-server.c' || echo '$(srcdir)/'`gsm-xsmp-server.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-xsmp-server.Tpo $(DEPDIR)/gnome_session_binary-gsm-xsmp-server.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-xsmp-server.c' object='gnome_session_binary-gsm-xsmp-server.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-xsmp-server.o `test -f 'gsm-xsmp-server.c' || echo '$(srcdir)/'`gsm-xsmp-server.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-xsmp-server.o `test -f 'gsm-xsmp-server.c' || echo '$(srcdir)/'`gsm-xsmp-server.c -gnome_session-gsm-xsmp-server.obj: gsm-xsmp-server.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-xsmp-server.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-xsmp-server.Tpo -c -o gnome_session-gsm-xsmp-server.obj `if test -f 'gsm-xsmp-server.c'; then $(CYGPATH_W) 'gsm-xsmp-server.c'; else $(CYGPATH_W) '$(srcdir)/gsm-xsmp-server.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-xsmp-server.Tpo $(DEPDIR)/gnome_session-gsm-xsmp-server.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-xsmp-server.c' object='gnome_session-gsm-xsmp-server.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-xsmp-server.obj: gsm-xsmp-server.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-xsmp-server.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-xsmp-server.Tpo -c -o gnome_session_binary-gsm-xsmp-server.obj `if test -f 'gsm-xsmp-server.c'; then $(CYGPATH_W) 'gsm-xsmp-server.c'; else $(CYGPATH_W) '$(srcdir)/gsm-xsmp-server.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-xsmp-server.Tpo $(DEPDIR)/gnome_session_binary-gsm-xsmp-server.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-xsmp-server.c' object='gnome_session_binary-gsm-xsmp-server.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-xsmp-server.obj `if test -f 'gsm-xsmp-server.c'; then $(CYGPATH_W) 'gsm-xsmp-server.c'; else $(CYGPATH_W) '$(srcdir)/gsm-xsmp-server.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-xsmp-server.obj `if test -f 'gsm-xsmp-server.c'; then $(CYGPATH_W) 'gsm-xsmp-server.c'; else $(CYGPATH_W) '$(srcdir)/gsm-xsmp-server.c'; fi` -gnome_session-gsm-consolekit.o: gsm-consolekit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-consolekit.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-consolekit.Tpo -c -o gnome_session-gsm-consolekit.o `test -f 'gsm-consolekit.c' || echo '$(srcdir)/'`gsm-consolekit.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-consolekit.Tpo $(DEPDIR)/gnome_session-gsm-consolekit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-consolekit.c' object='gnome_session-gsm-consolekit.o' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-consolekit.o: gsm-consolekit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-consolekit.o -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-consolekit.Tpo -c -o gnome_session_binary-gsm-consolekit.o `test -f 'gsm-consolekit.c' || echo '$(srcdir)/'`gsm-consolekit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-consolekit.Tpo $(DEPDIR)/gnome_session_binary-gsm-consolekit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-consolekit.c' object='gnome_session_binary-gsm-consolekit.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-consolekit.o `test -f 'gsm-consolekit.c' || echo '$(srcdir)/'`gsm-consolekit.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-consolekit.o `test -f 'gsm-consolekit.c' || echo '$(srcdir)/'`gsm-consolekit.c -gnome_session-gsm-consolekit.obj: gsm-consolekit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-consolekit.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-consolekit.Tpo -c -o gnome_session-gsm-consolekit.obj `if test -f 'gsm-consolekit.c'; then $(CYGPATH_W) 'gsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/gsm-consolekit.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-consolekit.Tpo $(DEPDIR)/gnome_session-gsm-consolekit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-consolekit.c' object='gnome_session-gsm-consolekit.obj' libtool=no @AMDEPBACKSLASH@ +gnome_session_binary-gsm-consolekit.obj: gsm-consolekit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_binary-gsm-consolekit.obj -MD -MP -MF $(DEPDIR)/gnome_session_binary-gsm-consolekit.Tpo -c -o gnome_session_binary-gsm-consolekit.obj `if test -f 'gsm-consolekit.c'; then $(CYGPATH_W) 'gsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/gsm-consolekit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_binary-gsm-consolekit.Tpo $(DEPDIR)/gnome_session_binary-gsm-consolekit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-consolekit.c' object='gnome_session_binary-gsm-consolekit.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-consolekit.obj `if test -f 'gsm-consolekit.c'; then $(CYGPATH_W) 'gsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/gsm-consolekit.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_binary_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_binary-gsm-consolekit.obj `if test -f 'gsm-consolekit.c'; then $(CYGPATH_W) 'gsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/gsm-consolekit.c'; fi` gnome_session_failed-gsm-fail-whale-dialog.o: gsm-fail-whale-dialog.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_failed_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_failed-gsm-fail-whale-dialog.o -MD -MP -MF $(DEPDIR)/gnome_session_failed-gsm-fail-whale-dialog.Tpo -c -o gnome_session_failed-gsm-fail-whale-dialog.o `test -f 'gsm-fail-whale-dialog.c' || echo '$(srcdir)/'`gsm-fail-whale-dialog.c @@ -1330,9 +1352,9 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"; do \ + for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1370,9 +1392,8 @@ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - mostlyclean-am +clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \ + clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1398,7 +1419,7 @@ install-dvi-am: -install-exec-am: install-binPROGRAMS install-libexecPROGRAMS +install-exec-am: install-binSCRIPTS install-libexecPROGRAMS install-html: install-html-am @@ -1438,30 +1459,34 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS +uninstall-am: uninstall-binSCRIPTS uninstall-libexecPROGRAMS .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ - clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binSCRIPTS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binSCRIPTS uninstall-libexecPROGRAMS .PRECIOUS: Makefile +gnome-session: gnome-session.in Makefile + $(AM_V_GEN) sed \ + -e "s|\@libexecdir\@|$(libexecdir)|" \ + $< > $@.tmp && mv $@.tmp $@ + org.gnome.SessionManager.h: org.gnome.SessionManager.xml Makefile.am $(AM_V_GEN) gdbus-codegen --interface-prefix org.gnome.SessionManager. \ --generate-c-code org.gnome.SessionManager \ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.App.c gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.App.c --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.App.c 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.App.c 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.App.h gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.App.h --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.App.h 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.App.h 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.c gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.c --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.c 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.c 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Client.c gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Client.c --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Client.c 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Client.c 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Client.h gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Client.h --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Client.h 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Client.h 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.ClientPrivate.c gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.ClientPrivate.c --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.ClientPrivate.c 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.ClientPrivate.c 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.ClientPrivate.h gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.ClientPrivate.h --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.ClientPrivate.h 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.ClientPrivate.h 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.h gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.h --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.h 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.h 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Inhibitor.c gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Inhibitor.c --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Inhibitor.c 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Inhibitor.c 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Inhibitor.h gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Inhibitor.h --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Inhibitor.h 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Inhibitor.h 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Presence.c gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Presence.c --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Presence.c 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Presence.c 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Presence.h gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Presence.h --- gnome-session-3.16.0/gnome-session/org.gnome.SessionManager.Presence.h 2014-12-12 15:24:08.000000000 +0000 +++ gnome-session-3.18.1.2/gnome-session/org.gnome.SessionManager.Presence.h 2015-10-15 20:46:45.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.43.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.46.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-session-3.16.0/ltmain.sh gnome-session-3.18.1.2/ltmain.sh --- gnome-session-3.16.0/ltmain.sh 2015-03-23 17:27:47.000000000 +0000 +++ gnome-session-3.18.1.2/ltmain.sh 2015-10-15 20:46:08.000000000 +0000 @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 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. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --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 -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.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.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 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. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -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 +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${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 +# 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 +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -# 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 +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# 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. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + require_term_colors=: } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## ----------------- ## +## Function library. ## +## ----------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd -# func_grep expression filename + '"$_d"' +}' + + +# 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" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# 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). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + 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 () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 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. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $ECHO "$my_tmpdir" + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} -# 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 + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# 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 () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - 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_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# 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 () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - 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 + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# 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 () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# 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 + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# 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 +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + func_usage_message + $ECHO "$long_help_message -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # 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 + 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 + 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 + 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 + fi - exit $EXIT_MISMATCH - 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 +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# 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 + # 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 + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# 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 - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # 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: +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + 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 $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # 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 +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; 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=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# 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= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { 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_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # 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}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + 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"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + 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 -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" + 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 @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # 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"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + 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. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# 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. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + 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" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + 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. @@ -1731,11 +3019,12 @@ # 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" + $debug_cmd + + 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" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + 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" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + 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" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# 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. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + 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}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + 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 ';.'; @@ -1849,7 +3143,7 @@ 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_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" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + 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 @@ -1937,7 +3235,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # 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" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + 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 \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ 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 "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 " - 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 " - 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" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # 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" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#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 +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + 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 @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result 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="" + 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 + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ fi } +# 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 () +{ + $debug_cmd + + 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 () +{ + $debug_cmd + + 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_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # 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 - 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 ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + 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 /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./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 + # archive that possess that section. Heuristic: eliminate + # all those that 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 @@ -3658,30 +5053,6 @@ $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 @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + 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 + 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="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,46 @@ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7327,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7352,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7360,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7384,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7392,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7408,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7427,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7439,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7450,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7489,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7497,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7529,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7537,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7549,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7592,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7621,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7635,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7658,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7679,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7710,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7732,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7756,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7767,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7794,13 @@ echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7811,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7827,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7870,30 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7907,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7940,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7982,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8030,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8042,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8061,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8078,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8115,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8126,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8148,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8193,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8237,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8297,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8308,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8318,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8335,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8370,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8381,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8430,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8448,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8463,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8472,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8485,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8498,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7095,23 +8538,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8564,12 @@ esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8627,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8722,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8739,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8749,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8772,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8793,42 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8836,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8874,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8914,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8995,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9042,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9059,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9084,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9100,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9109,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9133,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9149,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9180,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9223,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9273,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9308,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9334,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9357,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + 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 func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9388,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9404,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9439,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9449,12 @@ if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9465,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9518,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9526,25 @@ dlname= # 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. + if test yes = "$build_libtool_libs"; 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 + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || 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" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9569,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9583,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9594,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9620,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9629,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # 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 @@ -8175,7 +9667,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9678,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + 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" @@ -8209,8 +9701,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9710,16 @@ fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9738,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9753,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9762,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9791,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9824,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9837,14 @@ 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 + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9859,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9871,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9887,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9902,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9912,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9923,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9940,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9949,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9957,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9977,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9991,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10013,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10021,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10034,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10043,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; 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 @@ -8573,39 +10066,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10106,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10119,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10140,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || 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 + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10157,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10167,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10189,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10210,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10250,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10274,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10297,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10314,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10325,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10350,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10399,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10434,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10453,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10531,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10553,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10576,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10604,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10631,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10640,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10709,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10737,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10752,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + 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" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10792,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10818,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10861,9 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10872,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10886,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10912,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10927,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10962,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10988,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11006,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11017,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11038,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then 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 + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11077,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11091,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11101,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11122,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11145,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff -Nru gnome-session-3.16.0/m4/libtool.m4 gnome-session-3.18.1.2/m4/libtool.m4 --- gnome-session-3.16.0/m4/libtool.m4 2015-03-23 17:27:47.000000000 +0000 +++ gnome-session-3.18.1.2/m4/libtool.m4 2015-10-15 20:46:08.000000000 +0000 @@ -1,8 +1,6 @@ # 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, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -446,7 +456,7 @@ # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -598,7 +608,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,27 +715,31 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -733,13 +747,24 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +781,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -775,7 +798,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +996,7 @@ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1014,7 @@ 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 + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1032,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1054,7 @@ _lt_result=$? 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 + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1064,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1109,29 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _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\"`' + if test yes = "$lt_cv_ld_force_load"; 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 _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1151,7 @@ # 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 -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1169,7 @@ _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" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1189,8 @@ # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1218,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1247,17 @@ 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).], +[AS_HELP_STRING([--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 #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1267,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + 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.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1282,33 @@ [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1337,46 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1324,7 +1386,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -1369,19 +1438,20 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1389,7 +1459,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1398,7 +1468,7 @@ 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" + LD=${LD-ld}_sol2 fi ;; *) @@ -1414,7 +1484,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1433,11 +1503,11 @@ [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 + if test 0 -eq "$ac_status"; 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 + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1445,7 +1515,7 @@ ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1476,7 +1546,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1512,7 +1582,7 @@ [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1539,7 +1609,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1561,7 +1631,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1580,10 +1650,10 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1604,7 +1674,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1644,7 +1714,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1694,22 +1764,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env 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 + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1725,7 +1796,7 @@ ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1753,7 +1824,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1800,9 +1871,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1828,7 +1899,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1849,7 +1920,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1859,44 +1930,52 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1905,21 +1984,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1929,7 +2008,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1939,9 +2018,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2033,8 +2112,8 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2044,8 +2123,8 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2072,8 +2151,8 @@ _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2085,15 +2164,15 @@ _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2107,12 +2186,12 @@ fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2136,7 +2215,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2154,6 +2233,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2164,17 +2284,18 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2190,28 +2311,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2225,7 +2353,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2234,7 +2362,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2251,14 +2379,17 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2266,41 +2397,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2310,18 +2491,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2329,8 +2510,8 @@ bsdi[[45]]*) 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2342,7 +2523,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2351,8 +2532,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + 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~ @@ -2368,17 +2549,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + 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' @@ -2387,8 +2568,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2415,7 +2596,7 @@ 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" + 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'` @@ -2428,8 +2609,8 @@ 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'\''`~ + 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' @@ -2442,7 +2623,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2455,8 +2636,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2469,8 +2650,8 @@ 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' + 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 ;; @@ -2488,12 +2669,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2518,26 +2700,15 @@ esac ;; -gnu*) - 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 # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2555,14 +2726,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2570,8 +2742,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2580,8 +2752,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2594,8 +2766,8 @@ 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2606,7 +2778,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2614,8 +2786,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2634,8 +2806,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2644,13 +2816,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2678,11 +2870,15 @@ # 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 + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) 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" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2699,12 +2895,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2714,7 +2910,7 @@ newsos6) 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}' + 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 ;; @@ -2723,58 +2919,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2785,8 +2991,8 @@ 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2796,11 +3002,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2808,8 +3014,8 @@ sysv4 | sysv4.3*) 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2830,24 +3036,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then 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' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2865,7 +3071,7 @@ 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}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2873,8 +3079,8 @@ uts4*) 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' + 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 ;; @@ -2883,20 +3089,30 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2929,39 +3145,41 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2984,11 +3202,11 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3006,7 +3224,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3033,16 +3251,16 @@ AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3056,7 +3274,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3067,37 +3285,37 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3183,13 +3438,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3216,8 +3471,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3253,10 +3507,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3295,7 +3545,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -3317,8 +3567,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3371,6 +3621,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3411,33 +3664,38 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3448,21 +3706,21 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3470,8 +3728,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3517,8 +3775,8 @@ 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 + # two different shell functions defined in ltmain.sh; + # decide which one 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 @@ -3530,7 +3788,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3557,13 +3815,28 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3575,11 +3848,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3598,7 +3871,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3650,7 +3923,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3683,14 +3956,44 @@ symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$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"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3708,21 +4011,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3762,11 +4068,11 @@ 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 +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3792,7 +4098,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3812,9 +4118,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + 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 + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3835,7 +4141,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3862,12 +4168,16 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3883,17 +4193,18 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3904,8 +4215,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3921,6 +4232,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3970,7 +4286,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4011,14 +4327,14 @@ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4047,7 +4363,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4055,7 +4371,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4200,17 +4516,18 @@ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4221,8 +4538,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4239,6 +4556,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4309,7 +4631,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4317,11 +4639,30 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + 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' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4337,7 +4678,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4346,9 +4687,9 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4373,6 +4714,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4470,7 +4817,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4499,7 +4846,7 @@ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4565,17 +4912,21 @@ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4621,9 +4972,9 @@ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4639,7 +4990,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4647,7 +4998,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -4657,7 +5008,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4679,24 +5030,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4709,7 +5060,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4728,7 +5079,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4744,7 +5095,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4754,7 +5105,7 @@ # _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(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 @@ -4762,61 +5113,89 @@ _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' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4827,42 +5206,47 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; 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)='${wl}-rpath ${wl}$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 + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4876,8 +5260,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _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' + _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 ;; @@ -4895,8 +5279,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _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' + _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 @@ -4908,7 +5292,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4923,9 +5307,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4942,15 +5326,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _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' + _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 ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4966,7 +5350,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4974,34 +5358,57 @@ ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5020,13 +5427,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5045,61 +5460,80 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$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" + _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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5108,7 +5542,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5138,16 +5572,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + 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=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $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 @@ -5156,18 +5591,18 @@ # 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' + 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 @@ -5176,7 +5611,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + 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. @@ -5226,33 +5661,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - _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' + if test yes = "$GCC"; then + _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 "x$output_objdir/$soname" = "x$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' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5260,25 +5695,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _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 $pic_flag ${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 $pic_flag ${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 case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5286,14 +5721,14 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5304,7 +5739,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5315,16 +5750,16 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _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' + if test yes = "$GCC"; then + _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. # 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" + [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; }]], @@ -5337,21 +5772,31 @@ 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' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; 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' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -5366,7 +5811,7 @@ newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5374,27 +5819,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5405,33 +5842,53 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; 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} $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' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5442,24 +5899,24 @@ solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _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 $pic_flag ${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"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5469,11 +5926,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5483,10 +5940,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5535,43 +5992,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5586,17 +6043,17 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5613,7 +6070,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5693,12 +6150,12 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5739,10 +6196,10 @@ # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5782,18 +6239,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5801,8 +6258,12 @@ ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5810,13 +6271,13 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5824,14 +6285,14 @@ # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. 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 +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5873,7 +6334,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5915,35 +6376,35 @@ if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _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' + if test yes = "$with_gnu_ld"; then + _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' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5979,18 +6440,30 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -6000,6 +6473,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6018,13 +6498,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6042,64 +6530,84 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _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" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6109,7 +6617,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6137,57 +6645,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + 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=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $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' + 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(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' + _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, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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 @@ -6198,6 +6707,34 @@ _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6232,18 +6769,15 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6255,7 +6789,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6264,11 +6798,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $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' + if test yes = "$GXX"; then + _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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6278,15 +6812,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6312,13 +6846,13 @@ aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6329,20 +6863,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _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 $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 $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 $pic_flag ${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 @@ -6357,22 +6891,22 @@ interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6381,22 +6915,22 @@ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $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' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _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 $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' + _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 ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6404,8 +6938,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6414,10 +6948,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6431,59 +6965,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6497,18 +7031,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6516,10 +7050,10 @@ *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6577,22 +7111,17 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6608,9 +7137,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6628,17 +7157,17 @@ cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6653,21 +7182,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && 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-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' + _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 - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6713,9 +7242,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6723,7 +7252,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6740,30 +7269,30 @@ ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; 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 $pic_flag -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 $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 $pic_flag -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 $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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 @@ -6771,11 +7300,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6784,52 +7313,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6860,10 +7389,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6890,7 +7419,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6912,13 +7441,14 @@ 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}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7002,13 +7532,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7024,16 +7554,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + 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. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7041,9 +7571,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7058,15 +7588,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7097,51 +7627,6 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7150,7 +7635,7 @@ esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7170,10 +7655,10 @@ # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7210,7 +7695,7 @@ # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7232,7 +7717,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7246,21 +7731,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7268,11 +7757,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7289,9 +7778,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7301,11 +7790,11 @@ # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7342,7 +7831,7 @@ # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7364,7 +7853,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7380,21 +7869,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7402,11 +7895,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7426,7 +7919,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7436,7 +7929,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7470,7 +7963,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7507,7 +8000,7 @@ # -------------------------- # 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'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7541,7 +8034,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7578,7 +8071,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7594,7 +8087,7 @@ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7604,7 +8097,7 @@ _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= @@ -7633,7 +8126,7 @@ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7744,7 +8237,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7761,9 +8254,9 @@ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7787,27 +8280,7 @@ # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_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 -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7831,102 +8304,9 @@ ])# _LT_CHECK_SHELL_FEATURES -# _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_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_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]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _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"]) - - # 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 - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what 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], diff -Nru gnome-session-3.16.0/m4/lt~obsolete.m4 gnome-session-3.18.1.2/m4/lt~obsolete.m4 --- gnome-session-3.16.0/m4/lt~obsolete.m4 2015-03-23 17:27:48.000000000 +0000 +++ gnome-session-3.18.1.2/m4/lt~obsolete.m4 2015-10-15 20:46:08.000000000 +0000 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -Nru gnome-session-3.16.0/m4/ltoptions.m4 gnome-session-3.18.1.2/m4/ltoptions.m4 --- gnome-session-3.16.0/m4/ltoptions.m4 2015-03-23 17:27:48.000000000 +0000 +++ gnome-session-3.18.1.2/m4/ltoptions.m4 2015-10-15 20:46:08.000000000 +0000 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# 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@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff -Nru gnome-session-3.16.0/m4/ltsugar.m4 gnome-session-3.18.1.2/m4/ltsugar.m4 --- gnome-session-3.16.0/m4/ltsugar.m4 2015-03-23 17:27:48.000000000 +0000 +++ gnome-session-3.18.1.2/m4/ltsugar.m4 2015-10-15 20:46:08.000000000 +0000 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff -Nru gnome-session-3.16.0/m4/ltversion.m4 gnome-session-3.18.1.2/m4/ltversion.m4 --- gnome-session-3.16.0/m4/ltversion.m4 2015-03-23 17:27:48.000000000 +0000 +++ gnome-session-3.18.1.2/m4/ltversion.m4 2015-10-15 20:46:08.000000000 +0000 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru gnome-session-3.16.0/Makefile.in gnome-session-3.18.1.2/Makefile.in --- gnome-session-3.16.0/Makefile.in 2015-03-23 17:27:55.000000000 +0000 +++ gnome-session-3.18.1.2/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -162,7 +162,7 @@ DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ COPYING ChangeLog INSTALL NEWS README compile config.guess \ - config.sub depcomp install-sh ltmain.sh missing + config.sub install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -288,6 +288,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru gnome-session-3.16.0/NEWS gnome-session-3.18.1.2/NEWS --- gnome-session-3.16.0/NEWS 2015-03-23 17:27:10.000000000 +0000 +++ gnome-session-3.18.1.2/NEWS 2015-10-15 20:45:20.000000000 +0000 @@ -1,4229 +1,5 @@ -============== -Version 3.16.0 -============== - - * Bump version - -=============== -Version 3.15.92 -=============== - - * Fix bug in tracking if the session is active - * Fail whale fixes - * Translation updates - -=============== -Version 3.15.90 -=============== - - * Don't try to failwhale when the wayland compositor fails to start - * Support newer systemd client library layout - * Cut out more vestigial dbus-glib remnants - * Translation updates - -============== -Version 3.15.4 -============== - - * Allow turning on debugging with an environment variable - * Don't set DISPLAY in wayland sessions - * Add back session-name property - * Translation updates - -============== -Version 3.15.3 -============== - - * port to GDBus - * misc clean ups - * Translation updates - -============== -Version 3.14.0 -============== - - * DOAP updates - * Translation updates - -============== -Version 3.13.3 -============== - - * Fixes for XDG_CURRENT_DESKTOP semantic shift - * Translation updates - -============== -Version 3.12.1 -============== - - * Add DesktopNames to session files - * doap file updates - * ConsoleKit fixes - * Translation updates - -============== -Version 3.12.0 -============== - * fix for wayland support - -=============== -Version 3.11.92 -=============== - * Update FSF address in copyright headers - * Small wayland update - * Improve xtrans autogoo - * Translation updates - -============== -Version 3.11.4 -============== - - * Fix crash on startup for non-systemd systems - * Translation updates - -============== -Version 3.11.3 -============== - * Warning fixes - * Use modern methods for finding gsettings schemas - * fail whale size request fixes - * Translation updates - -============== -Version 3.11.2 -============== - * blacklist nv25 - * use new GSubprocess api - * Translation updates - -============== -Version 3.11.0 -============== - * Fix a possible crash in the presence interface - * gsm-manager: Don't abort when all clients exit (#710480) - * gsm-util: Use g_unsetenv() rather than g_setenv(variable, NULL) (#710485) - * Only support UPower 0.9 - * Drop EggSMClient - * Remove gnome-session-properties (#708923) - * Translation updates - -============== -Version 3.10.1 -============== - * Fix a crash on session end (#709221) - * Translation updates - -============== -Version 3.10.0 -============== - * Put gnome-shell-wayland.desktop in /usr/share/wayland-sessions instead of /usr/share/xsessions - * Translation updates - -============== -Version 3.9.92 -============== - * Add basic support for running Wayland sessions - * Translation updates - -============== -Version 3.9.91 -============== - * Add new phase for gnome-initial-setup and new phase for mutter-wayland - * Fix deadlock now that idle handling is in mutter - * Drop dead fallback code - * Add bits needed for wayland integration - * rename session-properties to gnome-session-properties - * make shutdown and reboot failable operations - * misc fixes - -============== -Version 3.9.90 -============== - * code style fix ups - * Set _GNOME_IS_SOFTWARE_RENDERING root window property when software rendering - * disable hardware acceleration for poulsbo driver - * Updated translations - -============== -Version 3.9.5 -============== - - * Check errors on D-Bus calls (#705163) - * Set up journal redirection earlier (#703661) - * Reshow end session dialog when inhibitor disappears (#702575) - * Always distribute session-selector.ui (#700363) - * Make GsmAutostartApp work with new GLib (#698798) - * Updated translations - -============== -Version 3.8.1 -============== - - * Check for logind, not systemd (#696262) - * Updated translations - -============== -Version 3.8.0 -============== - - * Updated translations - -============== -Version 3.7.92 -============== - - * Increase phase timeout to 90 seconds - * Updated translations - -============== -Version 3.7.91 -============== - - * Use pkg-config to check for X libraries - * Automatically fallback to software renderering if hardware renderering - doesn't pass the sniff test - * fix positioning of fail whale dialog - * Updated translations - -============== -Version 3.7.90 -============== - - * Add preliminary patch toward systemd-ification - * Fix XSMP clients after shutdown is canceled - * Make build with newer upower - * Adjust for new gnome-desktop idle api - * Add session selector - * Set XDG_MENU_PREFIX - * Updated translations - -============= -Version 3.7.4 -============= - - * Remove the fallback session definition (#687586) - * Remove support for RequiredProviders (#691663) - * Show the fail whale if GNOME shell can't run (#687586) - * Log to the systemd journal when available (#691785) - * Make SIGUSR1 print a line in debug output (#692241) - * Add an InhibitedActions D-Bus property (#692517) - * Reduce default idle timeout to 2 minutes - * Move automatic logout on idle functionality to - gnome-settings-daemon (#597030) - * Allow empty sessions (#690866) - * Allow named saved sessions (#613270) - * Updated translations (Hebrew, Lithuanian, Norwegian bokmål, - Slovak, Persian, Aragonese, Kazakh, Sovenian, Uyghur, Spanish, - Belarusian, Assamese, Serbian, Portuguese, Bulgarian, Dutch, - Friulian, Galician, Basque, Polish, Traditional Chinese, - Japanese, Italian) - -============= -Version 3.7.3 -============= - - * Use GnomeIdleMonitor for idle detection - * Enable llvmpipe - * Fix some error spew - * make --version not return a failure code - * reduce depedency on GTK+ - * shutdown and logout fixes - * Add automatic logout on idle feature - * docs fixes - * misc fixes - * Updated translations (Assamese, Estonian, Galician, Hebrew, Kannada, Odia, Polish, Slovenian, Spanish) - -============= -Version 3.7.2 -============= - - * Be more careful when dropping system inhibitors - * Add a commandline wrapper for inhibiting - * Add a GetLocale() D-Bus method - * Add a SessionIsActive D-Bus property - * Modernize the code in some places - * Initialize GsmSystem before acquiring a bus name - * Properly initialize upower client - * Reject xsmp clients sooner when ending the session - * Set _GNOME_MAX_SCREEN_SIZE root window property - * Updated translations (Greek, Hebrew, Slovak, Slovenian) - -============= -Version 3.7.1 -============= - - Session Manager - - * Add gnome-screensaver to fallback session - * Make SessionName property introspectable - -============= -Version 3.6.0 -============= - - Session Manager - - * Make autostart overriding more flexible - * Updated translations - -============== -Version 3.5.91 -============== - - Session Manager - - * Updated translations - -============= -Version 3.5.5 -============= - - Session Manager - - * Make XSMP error messages more clear - * Be more careful in systemd code when session fails to get registered - * Require newer glib - * Make gconf build time optional - * Updated translations - -============= -Version 3.5.4 -============= - - Session Manager - - * Add command for showing reboot dialog - * Inhibitor API / mechanism improvements - * Systemd integration fixes - * man page updates - * fail whale in more failure cases - * fix duplicate logout dialog when user hits cancel - * Updated translations - -============= -Version 3.5.2 -============= - - Session Manager - - * Require new logind version (Colin Walters) - * Remove markup from translatable string (Piotr Drąg) - * Fail softer in the face of spotty session bus (Ray, William Jon McCann) - * Consider that required component that exits with 1 has crashed (Vincent) - - Translators - - * Dirgita (id) - -============= -Version 3.4.2 -============= - - Capplet - - * Add Unity to OnlyShowIn in .desktop file (Jeremy Bicha) - - Translators - - * Yurek Hinz (csb) - * Takayuki KUSANO (ja) - -============= -Version 3.4.1 -============= - - Session Manager - - * Properly move to next phase if an app dies on startup (Vincent) - * Fix some restart/poweroff problems in the systemd code (Matthias - Clasen) - * Cleanups (Vincent) - - Translators - - * David Planella (ca) - * David Planella (ca@valencia) - * Reşat SABIQ (crh) - * Wolfgang Stoeggl (de) - * Bruce Cowan (en_GB) - * Arash Mousavi (fa) - * Gabor Kelemen (hu) - * Milo Casagrande (it) - * Sandeep Shedmake (mr) - * Kjartan Maraas (nb) - -============= -Version 3.4.0 -============= - - Session Manager - - * Don't show toggle switches for gnome-shell extensions in fail whale - dialog; simply disable all extensions instead (Jasper St. Pierre) - * Code cleanups (Jasper St. Pierre) - - Translators - - * Nilamdyuti Goswami (as) - * Ihar Hrachyshka (be) - * Alexander Shopov (bg) - * David Planella (ca) - * David Planella (ca@valencia) - * Reşat SABIQ (crh) - * Marek Černocký (cs) - * flemming christensen (da) - * Daniel Mustieles (es) - * Mattias Põldaru (et) - * Luc Guillemin (fr) - * Fran Dieguez (gl) - * Sweta Kothari (gu) - * Yaron Shahrabani (he) - * Changwoo Ryu (ko) - * Aurimas Černius (lt) - * Rūdolfs Mazurs (lv) - * A S Alam (pa) - * Piotr Drąg (pl) - * Duarte Loreto (pt) - * Antonio Fernandes C. Neto (pt_BR) - * Yuri Myasoedov (ru) - * Matej Urbančič (sl) - * Мирослав Николић (sr) - * Miroslav Nikolić (sr@latin) - * Daniel Nylander (sv) - * Sasi Bhushan Boddepalli (te) - * Korostil Daniel (uk) - * Nguyễn Thái Ngọc Duy (vi) - * tuhaihe (zh_CN) - * Chao-Hsiung Liao (zh_HK) - * Chao-Hsiung Liao (zh_TW) - -============== -Version 3.3.92 -============== - - Session Manager - - * Minor bug fixes (Ray Strode, Jasper St. Pierre) - - Translators - - * Nilamdyuti Goswami (as) - * Mattias Põldaru (et) - * Yuri Myasoedov (ru) - -============== -Version 3.3.90 -============== - - Session Manager - - * Fix the GsmSystem type registration (Matthias Clasen) - -============= -Version 3.3.5 -============= - - Session Manager - - * Use systemd session tracking instead of ConsoleKit when system is - booted with systemd (Matthias Clasen) - * Code cleanups (Matthias Clasen) - - Translators - - * Hideki Yamane (ja) - * Andreas N. (nn) - * Muhammet Kara (tr) - -============= -Version 3.3.3 -============= - - Tools - - * Blacklist pre-R300 Radeon hardware in accelerated check (Vincent) - -============= -Version 3.3.2 -============= - - Tools - - * Fix regexp for blacklisting Intel 830-865 hardware (Vincent) - - Translators - - * Kristjan SCHMIDT (eo) - * Muhammet Kara (tr) - -============= -Version 3.3.1 -============= - - Tools - - * Look at gnome.fallback={0,1} argument in kernel boot line to - determine if fallback mode should be enforced or ignored (Vincent) - * Use whitelist/blacklist regexps in an external file when evaluating - renderer for accelerated check (Vincent) - * Blacklist Intel 830-865 hardware when checking for accelerated - hardware (Vincent) - - Translators - - * Ihar Hrachyshka (be) - -============= -Version 3.2.1 -============= - - Session Manager - - * Refuse to install an idle timeout of 0 seconds (Rodrigo Moya) - * Fix crash on Solaris because of bad comparison (Brian Cameron) - - Translators - - * David Planella (ca@valencia) - * Kristjan SCHMIDT (eo) - * Nguyễn Thái Ngọc Duy (vi) - * Chao-Hsiung Liao (zh_HK) - * Chao-Hsiung Liao (zh_TW) - -============= -Version 3.2.0 -============= - - Translators - - * Nilamdyuti Goswami (as) - * Petr Kovar (cs) - * flemming christensen (da) - * Inaki Larranaga Murgoitio (eu) - * Tommi Vainikainen (fi) - * Sweta Kothari (gu) - * Gabor Kelemen (hu) - * Andika Triwidada (id) - * Changwoo Ryu (ko) - * Aurimas Černius (lt) - * Мирослав Николић (sr) - * Miroslav Nikolić (sr@latin) - * Praveen Illa (te) - * Korostil Daniel (uk) - -============== -Version 3.1.92 -============== - - Session Manager - - * Never mark as handled the Disconnected signal from dbus (Vincent) - * Disconnect all dbus clients when dbus is disconnected (Vincent) - * Don't offer logout in the fail whale on the login screen (Matthias Clasen) - * Code improvements (Matthias Clasen, Vincent) - - Translators - - * Anass Ahmed (ar) - * Ihar Hrachyshka (be) - * Alexander Shopov (bg) - * David Planella (ca) - * Mario Blättermann (de) - * Bruce Cowan (en_GB) - * Daniel Mustieles (es) - * Arash Mousavi (fa) - * Luc Guillemin (fr) - * Yaron Shahrabani (he) - * Luca Ferretti (it) - * Jiro Matsuzawa (ja) - * Rūdofls Mazurs (lv) - * Wouter Bolsterlee (nl) - * A S Alam (pa) - * Piotr Drąg (pl) - * Duarte Loreto (pt) - * Antonio Fernandes C. Neto (pt_BR) - * Matej Urbančič (sl) - * Dr.T.Vasudevan (ta) - * Theppitak Karoonboonyanan (th) - * Wylmer Wang (zh_CN) - * Chao-Hsiung Liao (zh_HK) - * Chao-Hsiung Liao (zh_TW) - -============== -Version 3.1.91 -============== - - Session Manager - - * Fix usage of %lld for 64-bit formats (Owen Taylor) - * Add a translator comment (Matthias Clasen) - - Translators - - * Ihar Hrachyshka (be) - * Fran Dieguez (gl) - * Kjartan Maraas (nb) - * Daniel Nylander (sv) - -============== -Version 3.1.90 -============== - - Session Manager - - * Support for debugging the fail whale dialog (Jasper St. Pierre) - * Show gnome-shell extensions in the fail whale dialog (Jasper) - * Respect lockdown in the fail whale dialog (Matthias Clasen) - * Add an IsSessionRunning DBus method (Matthias) - * Remove obsolete gconf sanity check (William Jon McCann) - - Translation updates - - * Galician - * German - * Indonesian - * Norwegian bokmål - * Russian - * Spanish - * Thai - * Uighur - -============= -Version 3.1.5 -============= - - Session Manager - - * Fix --help to mention arguments for options that have one (Vincent) - * Support XDG_CURRENT_DESKTOP (Michael Terry, Vincent) - - Capplet - - * Respect OnlyShowIn and NotShowIn keys (Vincent, Michael Terry) - * Code cleanup (Vincent) - - Translators - - * Ihar Hrachyshka (be) - * Alexander Shopov (bg) - * Petr Kovar (cs) - * Jorge González (es) - * Tommi Vainikainen (fi) - * Yaron Shahrabani (he) - * Rūdofls Mazurs (lv) - * Kjartan Maraas (nb) - * Piotr Drąg (pl) - * Daniel Nylander (sv) - -============= -Version 3.1.3 -============= - - Session Manager - - * Fix build warnings (Vincent) - - Capplet - - * Fix build warning (Vincent) - - Misc - - * Modernize build system a bit (Vincent) - * Remove artificial librsvg dependency (Vincent) - - Translators - - * Мирослав Николић (sr) - * Miroslav Nikolić (sr@latin) - * Daniel Nylander (sv) - * Muhammet Kara (tr) - -============= -Version 3.1.2 -============= - - Session Manager - - * Fix race condition in idle monitor (Christopher Halse Rogers) - * Consistently use Restart and not Reboot (Chris Wilson) - * Fix crashes by not assuming XSMP clients set the SmProgram property - (Vincent) - * Make the acceleration checks refuse to work in zaphod mode (Adam - Jackson) - * Update libegg code (Vincent) - * Code cleanups (Vincent, Kjartan Maraas) - - Translators - - * David Planella (ca@valencia) - * Daniel Mustieles (es) - * Fran Diéguez (gl) - * Yaron Shahrabani (he) - * Kjartan Maraas (nb) - * Matej Urbančič (sl) - -============= -Version 3.0.2 -============= - - Translators - - * Kristjan SCHMIDT (eo) - * Sahran (ug) - -============= -Version 3.0.1 -============= - - Translators - - * Arash Mousavi (fa) - * Theppitak Karoonboonyanan (th) - * Lê Trường An (vi) - -============= -Version 3.0.0 -============= - -Session Manager: -- Change path of GSettings schema (Vincent) - -Translations: -- Updated af: Friedel Wolff -- Updated bn: Jamil Ahmed -- Updated ca: Jordi Serratosa -- Updated cs: Petr Kovar -- Updated da: Kris Thomsen -- Updated de: Wolfgang Stöggl -- Updated el: Simos Xenitellis -- Updated en_GB: Bruce Cowan -- Updated eu: Inaki Larranaga Murgoitio -- Updated hu: Gabor Kelemen -- Updated id: Dirgita -- Updated ko: Changwoo Ryu -- Updated lt: Gintautas Miliauskas -- Updated pt: Duarte Loreto -- Updated ta: Dr.T.Vasudevan -- Updated zh_CN: Aron Xu -- Updated zh_HK: Chao-Hsiung Liao -- Updated zh_TW: Chao-Hsiung Liao - -=============== -Version 2.91.94 -=============== - -Session Manager: Bump the phase timeout to 30 seconds. - -Translations: Swedish, Ukrainian, Punjabi, Norwegian bokmål, - Bazilian Portuguese, Dutch, Hebrew, German, Japanese, Arabic, - Russian, Vietnamese, Uighur, French, Latvian, Polish - -=============== -Version 2.91.93 -=============== - -Note this is a brown bag release. All users who need working log out and shut down -functionality should use this release instead of 2.91.92. - -Session Manager: -- Make work with latest version of the shell. - -Translations: -- Updated bg: Krasimir Chonov -- Updated es: Jorge González -- Updated it: Luca Ferretti -- Updated ro: Daniel Șerbănescu -- Updated sl: Matej Urbančič - -=============== -Version 2.91.92 -=============== - -Note to packagers: if you are using your own .session files, please update them -as the format has changed. - -Session Manager: -- Better fatal error handling in general, including specific handling when - required components fail (Colin Walters, William Jon McCann, Vincent) -- Improve wording of fallback dialog (Matthias Clasen) -- Avoid double-checking between gdm and gnome-session in - gnome-session-check-accelerated-helper (Matthias Clasen) -- Switch to using seconds for idle time (William Jon McCann) -- Honor disable-log-out and disable-user-switching lockdown settings (Ray - Strode, Vincent) -- Change format of .session files in a incompatible way; this is now documented - in the gnome-session man page (Vincent) -- Update gnome-session-quit man page (Vincent) -- Enforce the use of required components in the session (Vincent) -- Deal with conflicts between Provides in different applications by only having - one provider running; this was only working well for Provides defined in the - session definition (Vincent) -- Use app-id when saving session instead of startup-id for .desktop (Vincent) -- Explicitly require gnome-shell/gnome-panel in .session files, instead of - using providers (Vincent) -- Clean up saved session on logout if session is not getting saved (Vincent) -- Use "computer-fail" icon from theme instead of our own sad-computer (Vincent) -- Fix some gnome-shell/gnome-session interaction issue on logout, when a third - application cancels logout (Ray Strode) -- Code cleanups (Ray Strode, Vincent) - -Translations: -- Updated ar: Khaled Hosny -- Updated as: Nilamdyuti Goswami -- Updated en_GB: Bruce Cowan -- Updated es: Jorge González -- Updated et: Ivar Smolin -- Updated fr: Bruno Brouard -- Updated fy: Sense Hofstede -- Updated gl: Fran Diéguez -- Updated he: Yaron Shahrabani -- Updated hu: Gabor Kelemen -- Updated id: Andika Triwidada -- Updated ko: Changwoo Ryu -- Updated lv: Rudolfs -- Updated nb: Kjartan Maraas -- Updated nl: Wouter Bolsterlee -- Updated pl: Piotr Drąg -- Updated pt: Duarte Loreto -- Updated pt_BR: Flamarion Jorge -- Updated ro: Lucian Adrian Grijincu -- Updated ru: Yuri Myaseodov -- Updated sl: Andrej Žnidaršič -- Updated sr: Милош Поповић -- Updated sr@latin: Miloš Popović -- Updated sv: Daniel Nylander -- Updated uk: Korostil Daniel - -================= -Version 2.91.91.3 -================= - -Fix another problem with launching of gnome-session-check-accelerated-helper - -================= -Version 2.91.91.2 -================= - -More fixes and diagnostics for gnome-session-check-accelerated - -================= -Version 2.91.91.1 -================= - -Fix gnome-session-check-accelerated to return 0 on success, as expected - -=============== -Version 2.91.91 -=============== - -Session Manager: -- Better error message on not-found session (Colin Walters) -- Rename gnome-session-save to gnome-session-quit (William Jon McCann) -- Fix cancel button in logout dialog (Ray Strode) -- Increase is-accelerated runnable helper timeout (Colin Walters) -- Fix crash when if-session autostart condition is used (Matthias Clasen) -- Add gnome-session-check-accelerated to set a X property about acceleration - (Colin Walters) -- Rename gnome-session-is-accelerated to gnome-session-check-accelerated-helper - (Colin Walters) -- Fix typo (Vincent) - -Translations: -- Updated ar: Khaled Hosny -- Updated bg: Alexander Shopov -- Updated ca: David Planella -- Updated es: Daniel Mustieles -- Updated et: Ivar Smolin -- Updated fr: Alain Lojewski -- Updated he: Yaron Shahrabani -- Updated ko: Changwoo Ryu -- Updated lv: Rūdolfs Mazurs -- Updated nb: Kjartan Maraas -- Updated pa: A S Alam -- Updated sk: Pavol Šimo -- Updated sl: Matej Urbančič -- Updated sv: Daniel Nylander -- Updated uk: Korostil Daniel - -================= -Version 2.91.90.1 -================= - -Session Manager: -- Fix a crash happening in gdm (Colin Walters) - -Translations: -- Updated bn_IN: Runa Bhattacharjee - -=============== -Version 2.91.90 -=============== - -Session Manager: -- Update for GSettings schemas changes (Vincent) -- Read default session from GSettings (Alexander Larsson) -- Make the current session name available via dbus (Alexander Larsson) -- Support autostart conditions that depend on the current session (Alexander - Larsson) -- Make notification-daemon a required part of the fallback session (Matthias - Clasen) -- Show a dialog after login the first time we fall back to gnome-fallback - (Alexander Larsson) -- Various fixes to shell logout/shutdown dialog (Ray Strode) -- Code cleanups (Vincent) - -Misc: -- gsettings-desktop-schemas 0.1.7 is required - -Translations: -- Updated ar: Khaled Hosny -- Updated bg: Alexander Shopov -- Updated ca: David Planella -- Updated es: Jorge González -- Updated gu: Sweta Kothari -- Updated he: Yaron Shahrabani -- Updated nb: Kjartan Maraas -- Updated nl: Wouter Bolsterlee -- Updated sl: Matej Urbančič - -============== -Version 2.91.6 -============== - -Note to packagers: with the move to GSettings, gnome-session now depends on -gsettings-desktop-schemas. - -Session Manager: -- Fix build with latest GTK+ 3 (Matthias Clasen, Vincent) -- Migrate to GSettings (Ray Strode) -- Add support for shell logout/shutdown dialog (Ray Strode) -- Use fallback session if required components are missing (Matthias Clasen) - -Defined Sessions: -- Do not consider Gallium's softpipe and llvmpipe as accelerated (Vincent) -- Do not run nautilus by default (Matthias Clasen) - -Capplet: -- Migrate to GSettings (Ray Strode, Vincent) - -Misc: -- Change GETTEXT_PACKAGE to gnome-session-3.0 (Vincent) -- Drop gnome-wm script (Matthias Clasen) -- Add a runtime dependency on gsettings-desktop-schemas - -Translations: -- Updated ar: Khaled Hosny -- Updated bg: Alexander Shopov -- Updated ca: David Planella -- Updated es: Jorge González -- Updated et: Ivar Smolin -- Updated gl: Fran Diéguez -- Updated he: Yaron Shahrabani -- Updated hu: Gabor Kelemen -- Updated id: Andika Triwidada -- Updated nb: Kjartan Maraas -- Updated nl: Wouter Bolsterlee -- Updated sl: Matej Urbančič -- Updated sv: Daniel Nylander -- Updated ug: Sahran -- Updated zh_HK: Chao-Hsiung Liao -- Updated zh_TW: Chao-Hsiung Liao - -============== -Version 2.91.4 -============== - -Note to distributors: - - the definition of the session started by gnome-session moved out of gconf - and is now living in .desktop-like files. The format of those files might - change in the future. - - two predefined sessions are shipped: GNOME (default), that will start GNOME - Shell, and Classic GNOME, that will start gnome-panel, metacity, etc. like in - GNOME 2. - - a small utility, gnome-session-is-accelerated, is used to determine if GNOME - Shell can be used. If this is not the case, Classic GNOME will be used. - Please send feedback on when this utility doesn't detect things properly. - - it is known that session saving doesn't work well with people moving from - one session to another at the moment. It can result in gnome-panel running - with GNOME Shell, for example. - -Session Manager: -- Add autostart condition through GSettings (Bastien Nocera) -- Don't ever show inhibitor dialog if logout is forced (Ray Strode) -- Fix some issue tracking clients on logout (Ray Strode) -- Add an application restart limit (William Jon McCann) -- Move the definition of a session from gconf to .desktop-like files (Vincent) -- Change default session to use GNOME Shell, with a fallback to classic GNOME - (Vincent) -- Update for GTK+ 3 changes (Matthias Clasen) -- Code cleanups (Vincent) - -Capplet: -- Set NoDisplay=true (William Jon McCann) -- Fix inline search (Ricardo Cruz) -- Update for GTK+ 3 changes (Cosimo Cecchi, Vincent) - -Translations: -- Updated ca@valencia: David Planella -- Updated crh: Reşat SABIQ -- Updated es: Jorge González -- Updated et: Ivar Smolin -- Updated fa: Mahyar Moghimi -- Updated fi: Ville-Pekka Vainio -- Updated fy: Sense Hofstede -- Updated gl: Fran Diéguez -- Updated he: Yaron Shahrabani -- Updated ja: Yasumichi Akahoshi -- Updated ko: Changwoo Ryu -- Updated nb: Kjartan Maraas -- Updated ro: Daniel Șerbănescu -- Updated sl: Matej Urbančič -- Updated th: Theppitak Karoonboonyanan -- Updated ug: Sahran - -============== -Version 2.91.0 -============== - -Session Manager: -- Miscellaneous string fixes (Philip Withnall) -- Fix for GTK+ 3 changes (Vincent, Ray Strode, Fernando Herrera) - -Misc -- Update information in README and other files (Vincent) -- Update man pages (Vincent) -- Build against GTK+ 3 by default (Ray Strode) -- Rename --enable-deprecations configure flag to --enable-deprecation-flags - (Vincent) - -Translations: -- Updated ar: Khaled Hosny -- Updated bg: Damyan Ivanov -- Updated ca: David Planella -- Updated cs: Petr Kovar -- Updated da: Kenneth Nielsen -- Updated de: Christian Kirbach -- Updated el: Kostas Papadimas -- Updated en_GB: Philip Withnall -- Updated es: Jorge González -- Updated et: Mattias Põldaru -- Updated fi: Jiri Grönroos -- Updated fr: Claude Paroz -- Updated gl: Fran Dieguez -- Updated he: Yaron Shahrabani -- Updated hu: Gabor Kelemen -- Updated id: Andika Triwidada -- Updated it: Luca Ferretti -- Updated ja: Takayuki KUSANO -- Updated lt: Žygimantas Beručka -- Updated nb: Kjartan Maraas -- Updated nl: Wouter Bolsterlee -- Updated pa: A S Alam -- Updated pl: Tomasz Dominikowski -- Updated pt: Duarte Loreto -- Updated pt_BR: Daniel S. Koda -- Updated sk: Pavol Šimo -- Updated sl: Matej Urbančič -- Updated sr: Милош Поповић -- Updated sr@latin: Miloš Popović -- Updated sv: Daniel Nylander -- Updated ta: Dr.T.Vasudevan -- Updated ug: Gheyret T.Kenji -- Updated zh_CN: Aron Xu -- Updated zh_HK: Chao-Hsiung Liao -- Updated zh_TW: Chao-Hsiung Liao - -============== -Version 2.31.6 -============== - -Session Manager: -- Fix a GSeal issue (Vincent) -- Fixed spelling error in schema description (Frédéric Péters) -- Port gnome-session to upower ((Richard Hughes) -- Fix description of auto_save_session key (Vincent) - -Misc -- Drop compatibility tool that sets GTK+ 1.x environment variable (Vincent) -- Drop the splash program (Paolo Borelli) -- Require upower-glib instead of devkit-power-gobject (Richard Hughes) -- Add configure flag to select which GTK+ version to use (Frédéric Péters) - -Translations: -- Updated bn_IN: Runa Bhattacharjee -- Updated de: Mario Blättermann -- Updated eo: Kristjan SCHMIDT -- Updated es: Jorge González -- Updated et: Mattias Põldaru -- Updated fy: Sense Hofstede -- Updated gl: Fran Diéguez -- Updated gu: Sweta Kothari -- Updated he: Yaron Shahrabani -- Updated lv: Rūdolfs Mazurs -- Updated mr: Sandeep Shedmake -- Updated nb: Kjartan Maraas -- Updated pa: A S Alam -- Updated sl: Matej Urbančič -- Updated sv: Daniel Nylander -- Updated zh_CN: Aron Xu - -============== -Version 2.31.2 -============== - -Session Manager: -- Export _stop method for clients, for better GNOME Shell experience (Colin - Walters) - -Misc: -- Explicitly add -lXext -lXau to linker line (Colin Walters) - -Translations: -- Updated ca: David Planella -- Updated ca@valencia: David Planella -- Updated en@shaw: Thomas Thurman -- Updated en_GB: Philip Withnall -- Updated fi: Timo Jyrinki -- Updated id: Andika Triwidada -- Updated kn: Shankar Prasad -- Updated mr: Sandeep Shedmake -- Updated nl: Wouter Bolsterlee -- Updated or: Manoj Kumar Giri - -============== -Version 2.30.0 -============== - -Misc: -- Add more information to configure summary (Vincent) - -Translations: -- Updated bn: Israt Jahan -- Updated eu: Iñaki Larrañaga Murgoitio -- Updated ko: Changwoo Ryu -- Updated sr: Горан Ракић -- Updated sr@latin: Goran Rakić - -=============== -Version 2.29.92 -=============== - -Note for distributors: the log out on SIGTERM/SIGINT possibly create a -misbehavior with old versions of the GDM greeter. It is recommended to use this -release with GDM 2.29.92. - -Session Manager: -- Log out on SIGTERM and SIGINT (Halton Huo) -- Delay the creation of the GsmXSMPClient until it really exists, to fix - potential crashes on logout (Romain Perier) - -Misc: -- Remove unneeded LIBGNOMEUI_REQUIRED from configure.in (Vincent) - -Translations: -- Updated gl: Fran Diéguez -- Updated ko: Changwoo Ryu -- Updated nn: Torstein Adolf Winterseth -- Updated pl: Piotr Drąg - -============== -Version 2.29.6 -============== - -Session Manager: -- Fix typo in error message (Vincent) -- Add diagnostic output for exit phase timeout (Matthias Clasen) -- GSeal: Use accessor functions instead of direct access (Javier Jardón) -- Check that the XSMP connection exists when stopping a client to fix potential - crash on exit (Romain Perier) - -Capplet: -- Destroy the main window on close to ensure changes are saved (Vincent) - -Misc: -- Install the helpers in libexecdir, not libdir (Vincent) - -Translations: -- Updated as: Amitakhya Phukan -- Updated crh: Reşat SABIQ -- Updated el: nikosCharonitakis -- Updated en@shaw: Thomas Thurman -- Updated nds: Nils-Christoph Fiedler -- Updated pt_BR: André Gondim -- Updated ru: Anisimov Victor -- Updated sl: Matej Urbančič -- Updated zh_CN: Tao Wei - -============== -Version 2.28.0 -============== - -- Trivial code fixes (Vincent) -- Lock the screen before hibernate/suspend (Richard Hughes) - -Translations: -- Updated as: Amitakhya Phukan -- Updated br: Denis Arnaud -- Updated ca: David Planella -- Updated cs: Petr Kovar -- Updated da: Kenneth Nielsen -- Updated de: Wolfgang Stoeggl -- Updated en_GB: Philip Withnall -- Updated hi: Rajesh Ranjan -- Updated kn: Shankar Prasad -- Updated lt: Gintautas Miliauskas -- Updated mai: Sangeeta Kumari -- Updated ml: Peter Ani -- Updated mr: Sandeep Shedmake -- Updated or: Manoj Kumar Giri -- Updated pa: A S Alam -- Updated pt_BR: André Gondim -- Updated ro: Lucian Adrian Grijincu -- Updated sl: Matej Urbančič -- Updated sr: Горан Ракић -- Updated sr@latin: Goran Rakić -- Updated te: Krishna Babu K -- Updated uk: Maxim Dziumanenko -- Updated zh_HK: Chao-Hsiung Liao -- Updated zh_TW: Chao-Hsiung Liao - -=============== -Version 2.27.92 -=============== - -- Remove at-spi-registryd wrapper (at-spi properly implements session - management) (Lucas) - -Translations: -- Updated be: Alexander Nyakhaychyk -- Updated bn: Loba Yeasmeen -- Updated bn_IN: Runa Bhattacharjee -- Updated br: Denis -- Updated et: Ivar Smolin -- Updated eu: Iñaki Larrañaga Murgoitio -- Updated fr: Claude Paroz -- Updated hu: Gabor Kelemen -- Updated ja: Takayuki KUSANO -- Updated pl: Tomasz Dominikowski -- Updated pt: Duarte Loreto -- Updated tr: Baris Cicek - -=============== -Version 2.27.91 -=============== - -Note: this release contains a port of the PolicyKit code to PolicyKit 1, which -is needed for gnome-session to work with newer ConsoleKit. However, because of -limitations of the ConsoleKit API, there are some regressions that cannot be -addressed. See http://bugzilla.gnome.org/show_bug.cgi?id=585614 for more -details. - -- Install splash desktop file in $(sysconfdir)/xdg/autostart (Vincent) -- Do not install gnome-splash.png unless --enable-splash is used (Vincent) -- Fix idle watch not working (Vincent) -- Fix typo in debug message (Oskar Wallgren) -- Use GTK+ accessor functions instead direct access (Javier Jardón) -- Remove deprecated Encoding key from desktop file (Frédéric Péters) -- Port to PolicyKit 1 (Matthias Clasen) -- Remove dependency on PolicyKit libraries (Matthias Clasen) - -Translations: -- Updated ar: Khaled Hosny -- Updated bg: Alexander Shopov -- Updated ga: Seán de Búrca -- Updated gl: Antón Méixome -- Updated gu: Sweta Kothari -- Updated it: Luca Ferretti -- Updated ko: Changwoo Ryu -- Updated nb: Kjartan Maraas -- Updated or: Manoj Kumar Giri -- Updated pt_BR: Djavan Fagundes -- Updated th: Theppitak Karoonboonyanan - -============== -Version 2.27.5 -============== - -- Prefer compiz-manager over compiz when available in gnome-wm (Vincent) -- Add --with-default-wm configure option to let distributors specify the - default window manager they want to use (including gnome-wm) (Vincent) -- Use silent-rules with automake 1.11 (Vincent) -- Add --enable-splash configure option to build splash, and disable splash - build by default (Vincent) -- Add Presence interface to the documentation (William Jon McCann) -- Do not exit when the system bus restarts (Vincent, Sjoerd Simmons) -- Port from gnome-power-manager to DeviceKit-power (Richard Hughes) - DeviceKit-power is a new dependency. -- Code cleanup (Vincent) - -Translations: -- Updated es: Jorge González -- Updated et: Ivar Smolin (et) -- Updated fi: Ilkka Tuohela (fi) -- Updated he: Yaron Shahrabani (he) -- Updated sv: Daniel Nylander (sv) -- Updated ta: Dr.T.Vasudevan (ta) - -============== -Version 2.27.4 -============== - -- Reduce GConf roundtrips (Matthias Clasen) -- Use shave to improve build log readability (Vincent) -- Fix a crash on Solaris (Ghee Teo) -- Generate docs for the presence API (Matthias Clasen) -- Rewrite a good part of the capplet. Some highlights: - - much cleaner code - - monitor autostart files - - autofill name field if needed - - add help button - - better handling of themed and non-themed application icons - - allow dragging from the application list - - make it more clear that applications are disabled - (Vincent) -- Port to GtkBuilder (Vincent) -- Improve debug message (Vincent) -- Load default apps after saved and autostart apps (Vincent) -- Build fixes for BSD (Daniel Macks, Alexis Ballier) -- Update eggsmclient code to fix crash (Vincent) -- Add mutter support to gnome-wm (Jon Nettleton) -- Make gnome-session exit properly on reboot/shutdown (Bill Nottingham) -- Avoid pointless warnings (Matthias Clasen) -- Honour the SmRestartNever SmRestartStyleHint (Caolan McNamara) -- Default clients to RESTART_IF_RUNNING instead of NEVER (Caolan McNamara) -- Code cleanups (Vincent) - -Translations: -- Updated ar: Khaled Hosny -- Updated ca@valencia: David Planella -- Updated da: Kenneth Nielsen -- Updated de: Christian Kirbach -- Updated es: Jorge González -- Updated et: Ivar Smolin -- Updated he: Mark Krapivner -- Updated te: Krishna Babu K -- Updated uk: Maxim Dziumanenko - -============== -Version 2.26.1 -============== - -- Fix inhibitor dialog not showing the right action button when shutting down - (Vincent) -- Make gnome-session-save --kill --silent work as --force-logout (Vincent) -- Correctly use the arguments passed to gnome-session when launched with no - session dbus (Vincent) - -Translations: -- Updated sr: Горан Ракић -- Updated zh_CN: Ray Wang - -================= -Version 2.26.0.90 -================= - -Note: while this is a tarball from a stable branch, this version should be -considered as a test tarball. It contains some important changes to the session -manager to fix various issues, and we want those changes to be tested before -2.26.1. - -Depending on how D-Bus and ConsoleKit are configured on your system, you might -need the patch from https://bugs.freedesktop.org/show_bug.cgi?id=20471 for your -ConsoleKit configuration. This is required so it's possible for applications to -be able to know if there are more than one user logged in on the machine. - -The two main fixes for this release are: - - gnome-session now lets applications properly exit on logout - - saving a session on logout is activated again - -- Update man pages (Vincent) -- Let all processes exit cleanly on logout/reboot/shutdown (Vincent) -- Use smaller icon size in inhibit dialog (Vincent) -- Fix various crashes in inhibit dialog and during the logout process (Vincent) -- Make the inhibit dialog look at desktop files from autostart directories too - (Vincent) -- Use XDG_CONFIG_HOME to save the session and create the session directory with - the right permissions (Vincent) -- Get the discard command from XSMP clients and save it when saving a session, - and use it when removing a saved session (Vincent) -- Properly handle XSMP clients that don't return a restart command when saving - the session (Vincent) -- Various XSMP protocol fixes (Vincent) -- When saving the session, ask the XSMP clients to save the global and local - states when needed instead of just asking them to save their global states. - Else, clients won't appear on next login (Vincent) -- Allow XSMP clients to interact during the logout (and cancel the logout), - using the inhibit infrastructure (Vincent) -- Allow clients to specify that they want to be ended last (Vincent) -- Hide deprecated command-line options from gnome-session-save --help (Vincent) -- Re-enable session saving (Vincent) -- Ignore XSyncAlarmDestroyed events, to avoid filling ~/.xsession-errors - (Matthias Clasen) -- Various code cleanups (Vincent) - -Translations: -- Updated ar: Anas Afif Emad -- Updated el: Jennie Petoumenou -- Updated hu: Gabor Kelemen -- Updated kn: Shankar Prasad -- Updated nb: Kjartan Maraas -- Updated pa: A S Alam -- Updated ru: Nickolay V. Shmyrev - -============== -Version 2.26.0 -============== - -Note: this release disables session saving because it's not ready for wide -usage. It will hopefully be fixed for 2.26.1. - -- Turn off debug spew (Lucas) -- Hide the "Save current session" button in the session properties since it's - not working (Vincent) -- Disable session saving because it's not ready yet (Vincent) - -Translations: -- Updated as: Amitakhya Phukan -- Updated crh: Reşat SABIQ -- Updated cs: Petr Kovar -- Updated el: Jennie Petoumenou -- Updated es: Jorge González -- Updated et: Ivar Smolin -- Updated gl: Suso Baleato -- Updated gu: Ankit Patel -- Updated he: Yaron Shahrabani -- Updated hi: Rajesh Ranjan -- Updated ja: Takeshi AIHANA -- Updated lt: Žygimantas Beručka -- Updated mr: Sandeep Shedmake -- Updated nb: Kjartan Maraas -- Updated or: Manoj Kumar Giri -- Updated ps: Zabeeh Khan -- Updated ta: I. Felix -- Updated te: Krishna Babu K - -=============== -Version 2.25.92 -=============== - -Note: this release brings back session saving. There might be bugs for this, so -make sure to test this thoroughly. - -- Ensure treeview is included in a scrolled window with a shadow in the inhibit - dialog (Frédéric Crozat) -- Use system-log-out icon instead of deprecated gnome-logout (Matthias Clasen) -- Implement session saving (Lucas) -- Use close button instead of ok button for error dialog (Vincent) -- Fix the logout dialog not being themed (Matthias Clasen) -- Code cleanup (Lucas) - -Translations: -- Updated zh_TW: Chao-Hsiung Liao -- Updated bg: Alexander Shopov -- Updated bn_IN: Runa Bhattacharjee -- Updated ca: David Planella -- Updated de: Wolfgang Stoeggl -- Updated en_GB: David Lodge -- Updated eu: Iñaki Larrañaga Murgoitio -- Updated fi: Ilkka Tuohela -- Updated fr: Bruno Brouard -- Updated gu: Sweta Kothari -- Updated hu: Gabor Kelemen -- Updated it: Luca Ferretti -- Updated ja: Takeshi AIHANA -- Updated ko: Changwoo Ryu -- Updated lv: Raivis Dejus -- Updated pt_BR: Og Maciel -- Updated pt: Duarte Loreto -- Updated ro: Adi Roiban -- Updated sv: Daniel Nylander -- Updated th: Theppitak Karoonboonyanan -- Updated tr: Baris Cicek -- Updated zh_HK: Chao-Hsiung Liao -- Updated zh_TW: Chao-Hsiung Liao - -=============== -Version 2.25.91 -=============== - -- Fix copy & paste error in debug output (Matthias Clasen) -- Avoid restarting applications when shutting down (Brian Cameron) -- Improve logout/shutdown dialog messages (Matthias Clasen) -- Change the capplet name in (Lucas, Luca Ferretti) -- Remove obsolete logout_option gconf key (Luca Ferretti) -- Update description of required_components_list gconf key (Luca Ferretti) - -Translations: -- Updated ast: Mikel González -- Updated bg: Alexander Shopov -- Updated crh: Reşat SABIQ -- Updated da: Kenneth Nielsen -- Updated dz: Dawa pemo -- Updated es: Jorge González -- Updated et: Ivar Smolin -- Updated eu: Iñaki Larrañaga Murgoitio -- Updated fi: Ilkka Tuohela -- Updated gl: Ignacio Casal Quinteiro -- Updated kn: Shankar Prasad -- Updated mk: Jovan Naumovski -- Updated nb: Kjartan Maraas -- Updated nl: Wouter Bolsterlee -- Updated pl: Tomasz Dominikowski -- Updated pt_BR: Andre Gondim -- Updated ro: Adi Roiban -- Updated sr: Горан Ракић -- Updated sv: Daniel Nylander -- Updated te: Bharat Kumar -- Updated th: Theppitak Karoonboonyanan -- Updated vi: Clytie Siddall -- Updated zh_HK: Chao-Hsiung Liao -- Updated zh_TW: Chao-Hsiung Liao - -=============== -Version 2.25.90 -=============== - -- Install autostart files in /etc/xdg/autostart (Vincent) -- Use 22x22 icons in the splash screen (Vincent) -- Fix a potential crash in the splash screen (Vincent) -- Fix dbus documentation to mention the session bus instead of system bus - (Richard Hughes) -- Fix build when XTest is not available (Vincent) -- Fix generation of dbus documentation to have valid docbook (Vincent) - -Translations: -- Updated ca: David Planella -- Updated fi: Ilkka Tuohela -- Updated he: Yair Hershkovitz -- Updated ko: Changwoo Ryu -- Updated lt: Žygimantas Beručka -- Updated pl: Tomasz Dominikowski -- Updated pt_BR: Andre Gondim -- Updated sv: Daniel Nylander - -============== -Version 2.25.5 -============== - -- Close ICE connection for qt3 applications (Edward Sheldrake) -- In all phases before APPLICATION, consider process termination as completion - (Behdad Esfahbod) -- Fix gnome-session not looking at $XDG_DATA_HOME/applications (tuxce) -- Correctly check for sm and ice libraries in configure script (Lucas) -- Correctly handle X-GNOME-Autostart-enabled=false in gnome-session-properties - (Halton Huo) -- Add support for --enable-polkit/--disable-polkit in configure script (default - is still automatic) (Nirbheek Chauhan) -- Add NoDisplay=True to desktop files (Lucas) -- Fix typo in error message (Lucas) -- Double-click startup program entry to open edit dialog in - gnome-session-properties (Lucas) -- Fix apps with an icon not existing in the icon theme displayed with no icon - (Lucas) -- Add 48x48 icon for session properties (Lucas) -- Add a presence dbus API (William Jon McCann) - -Translations: -- Updated ca: David Planella -- Updated de: Hendrik Richter -- Updated es: Jorge González -- Updated ha: saudat mohammed -- Updated ig: Onye, Sylvester -- Updated nb: Kjartan Maraas -- Updated sv: Daniel Nylander -- Updated uz@cyrillic: Nurali Abdurahmonov -- Updated uz: Nurali Abdurahmonov -- Updated yo: David Lodge - -============== -Version 2.25.3 -============== - -- Address issue with multiple clients trying to use the QueryEndSession dbus - API (Tim Kosse) -- Code and build system cleanups (Vincent) -- Stop using deprecated API (Vincent) -- Remove libgnomeui dependency (Vincent) - -============== -Version 2.25.2 -============== - -- Don't link to gnome-keyring and libgnomeui where we don't need (William Jon - McCann) -- Make the session properties dialog resizable (Matthias Clasen) -- Don't try to print an undefined error message (William Jon McCann) -- Build fixes (Kjartan Maraas) -- Rewrite the application finding code for the manager (Matthias Clasen) -- Add new dbus api to say whether shutdown dialog is available (Ray Strode) -- Remove compat wrapper for gnome-keyring session interaction (Stef Walter) -- Single include fixes for glib (Diego Escalante Urrelo) - -Translations: -- Updated ast: Mikel González -- Updated ku: Erdal Ronahi -- Updated sr: Горан Ракић -- Updated sv: Daniel Nylander - -============== -Version 2.24.1 -============== - -- Add GTK and GNOME categories to session-properties.desktop (Patryk Zawadzki) -- Fix leaks (Matthias Clasen) -- Rename variable to avoid symbol conflict (Frederic Peters) -- Fix padding and spacing, and make the dialog resizable in - gnome-session-properties (Christian Persch) -- Make the strings appear translated in gnome-session-properties (Luca - Ferretti) - -Translations: -- Updated ar: Anas Afif Emad -- Updated be@latin: Ihar Hrachyshka -- Updated ca: David Planella -- Updated dz: Dawa pemo -- Updated fi: Timo Jyrinki -- Updated it: Luca Ferretti -- Updated ja: Takeshi AIHANA -- Updated mk: Jovan Naumovski -- Updated pt_BR: Og Maciel -- Updated ru: Leonid Kanter - -============== -Version 2.24.0 -============== - -- Convert the username to UTF-8 in the logout dialog (Frederic Crozat) -- Fix leaks (Matthias Clasen) -- Turn off debugging by default (Vincent) - -Translations: -- Updated ar: Anas Afif Emad -- Updated bn_IN: Runa Bhattacharjee -- Updated ca: David Planella -- Updated da: M.P. Rommedahl -- Updated de: Hendrik Richter -- Updated el: Kostas Papadimas -- Updated es: Jorge González -- Updated et: Ivar Smolin -- Updated eu: Iñaki Larrañaga Murgoitio -- Updated fi: Timo Jyrinki -- Updated fr: Claude Paroz -- Updated hr: Launchpad Translations Administrators -- Updated hu: Gabor Kelemen -- Updated it: Luca Ferretti -- Updated kn: Shankar Prasad -- Updated lt: Žygimantas Beručka -- Updated mr: Sandeep Shedmake -- Updated ro: Eddy Petrișor -- Updated sv: Daniel Nylander -- Updated ta: I. Felix -- Updated tr: Baris Cicek -- Updated zh_HK: Chao-Hsiung Liao -- Updated zh_TW: Chao-Hsiung Liao - -=============== -Version 2.23.92 -=============== - -- Make all desktop files translatable (Vincent Untz) -- Avoid gnome-wm launching itself in loop (Vincent Untz) -- Remove required components from the default session (Vincent Untz) -- Rename /desktop/gnome/session/required_components key (Vincent Untz) -- Do not use dash but underscore to separate words in gconf keys (Vincent Untz) - -Translations: -- Updated es: Jorge Gonzalez -- Updated fr: Claude Paroz -- Updated bg: Alexander Shopov -- Updated nl: Wouter Bolsterlee -- Updated pt_BR: Leonardo Ferreira Fontenelle -- Updated pt: Duarte Loreto -- Updated zh_CN: Funda Wang -- Updated ml: Praveen Arimbrathodiyil -- Updated nb: Kjartan Maraas -- Updated ko: Changwoo Ryu -- Updated it: Luca Ferretti -- Updated sv: Daniel Nylander -- Updated pl: Tomasz Dominikowski -- Updated ga: Seán de Búrca -- Updated vi: Nguyễn Thái Ngọc Duy -- Updated cs: Petr Kovar -- Updated et: Priit Laes -+ * pl.po: Updated Polish -- Updated pt: Duarte Loreto -- Updated pt_BR: Og Maciel -+ * pt_BR.po: Updated translation Vladimir -- Updated th: Theppitak Karoonboonyanan -- Updated zh_HK: Chao-Hsiung Liao -- Updated zh_TW: Chao-Hsiung Liao - - -============== -Version 2.23.6 -============== - -General - - * dbus_based branch redesign moved to trunk - http://live.gnome.org/SessionManagement/GnomeSession. - - -Session Manager - - * New D-Bus API - * Set environment variables in session bus activation environment (Ray Strode) - -============== -Version 2.23.3 -============== - -General - - * Port gnome-session-save tool to new code base (Lucas Rocha) - * Misc memory leaks fixes (Lucas Rocha) - -Session Manager - - * Shutdown D-Bus, XSMP and GConf when session is over (Lucas Rocha) - * Emit "SessionRunning" and "SessionOver" D-Bus signals when - stating and ending a session respectively (Lucas Rocha) - * Splash screen goes away when session is fully running (Lucas Rocha) - * Fix gnome-keyring-wrapper program to correctly set SSH_AUTH_SOCK env - variable on session initialization phase (Lucas Rocha) - * Fix crash when appending apps defined on legacy session file (Ed Catmur) - * Fix the support for custom application icons to be shown on splash screen - via startup notification (Lucas Rocha) - * Deal with the possibility of multiple local connections, and recognize - "unix/" as a local connection prefix as well as "local/". Fixes XSMP - under Fedora Rawhide (Dan Winship) - * Remove dialog shown after a timeout in at-spi wrapper program in order - to avoid false-positive at-spi errors (Lucas Rocha) - -Session Properties Capplet - - * Add support for drag and drop of desktop files on Session Properties - capplet (Jared Moore) - -Translators - - * Djihed Afifi (ar) - * Ihar Hrachyshka (be@latin) - * Jorge Gonzalez (es) - * Clytie Siddall (vi) - * Ignacio Casal Quinteiro (gl) - * Gabor Kelemen (hu) - -================ -Version 2.23.2.2 -================ - -Session Properties Capplet - - * Fixed a critical crash when adding/editing startup apps. - * Don't mark widget labels for translation on .glade file. - -================ -Version 2.23.2.1 -================ - -General - - * Fixed libglade dependency to 2.3.6. - -============== -Version 2.23.2 -============== - -Session Properties Capplet - - * Capplet ported to new code base with several code cleanups. - -Translators - - * Jorge Gonzalez (es) - * Yair Hershkovitz (he) - * Ignacio Casal Quinteiro (gl) - * Yavor Doganov (bg) - -================ -Version 2.23.1.1 -================ - -General - - * Don't install any files on old default-session directories anymore - in order to avoid installation problems. - -============== -Version 2.23.1 -============== - -General - - * First development version with the brand-new code base. It completes - the first milestone which is to have a default session running. To know - more about the new architecture: - - http://live.gnome.org/SessionManagement/NewGnomeSession. - - For now, the new code base still has quite a lot of regressions which - we plan to fix during the 2.23/2.24 development cycle. - -Translators - - * Daniel Nylander (sv) - * Jorge Gonzalez (es) - * Kjartan Maraas (nb) - * Marcel Telka () - * Eskild Hustvedt (nn) - * Nguyễn Thái Ngọc Duy (vi) - -============== -Version 2.22.0 -============== - -Translators - - * Alexander Nyakhaichyk (be) - * Kenneth Nielsen (da) - * NikosCharonitakis (el) - * Gabor Kelemen (hu) - * Vasiliy Faronov (ru) - * Marcel Telka (sk) - -=============== -Version 2.21.93 -=============== - -Misc - - * Remove hard dependency on esound, this is handled by - gnome-settings-daemon now (Bastien Nocera) - -Session Manager - - * Don't start the sound server, and play the login sound when - gnome-settings-daemon tells us the sound server has started (Bastien - Nocera) - -Translators - - * Khaled Hosny (ar) - * Runa Bhattacharjee (bn_IN) - * David Lodge (en_GB) - * Jorge González (es) - * Stéphane Raimbault (fr) - * Luca Ferretti (it) - * Takeshi AIHANA (ja) - * Žygimantas Beručka (lt) - * sandeep shedmake (mr) - -=============== -Version 2.21.92 -=============== - -Misc - - * Require gnome-keyring >= 2.21.92 (Stef Walter) - -Session Manager - - * Correctly handle the environment variables given by gnome-keyring to - make it work in the whole session (Stef Walter) - -Translators - - * Ihar Hrachyshka (be@latin) - * Jordi Mallach (ca) - * Ilkka Tuohela (fi) - * Claude Paroz (fr) - * Changwoo Ryu (ko) - * Nabin Gautam (ne) - * Wouter Bolsterlee (nl) - * Yannig Marchegay (Kokoyaya) (oc) - * Matej Urbančič (sl) - * Yang Zhang (zh_CN) - - -=============== -Version 2.21.91 -=============== - -Session Manager - - * Make login sound work again (Bastien Nocera) - -Translators - - * Khaled Hosny (ar) - * Andre Klapper (de) - * Massimo Furlani (fur) - * Ignacio Casal Quinteiro (gl) - * Arangel Angov (mk) - * Tomasz Dominikowski (pl) - * Leonardo Ferreira Fontenelle (pt_BR) - * Duarte Loreto (pt) - * Daniel Nylander (sv) - * Theppitak Karoonboonyanan (th) - * Baris Cicek (tr) - * Woodman Tuen (zh_HK) - * Woodman Tuen (zh_TW) - -=============== -Version 2.21.90 -=============== - -Session Manager - - * Use max dithering again for splash (Frederic Crozat) - * Change capplet title (Luca Ferretti) - * HIG fixes in the capplet (Luca Ferretti) - -Translators - - * Khaled Hosny (ar) - * Petr Kovar (cs) - * Jorge González (es) - * Ivar Smolin (et) - * Iñaki Larrañaga Murgoitio (eu) - * Luca Ferretti (it) - * Kjartan Maraas (nb) - -============== -Version 2.21.5 -============== - -Session Manager - - * Set orientation with randr too (Luca Cavalli) - * Fix warnings and plug leaks (Kjartan Maraas, Matthias Clasen, - Vincent) - * HIG fixes (Dennis Cranston) - * Remove randr calls, they are done by gnome-settings-daemon now - (Lucas Rocha) - -Misc - - * Add session .desktop file (William Jon McCann) - -Translators - - * Anas Husseini (ar) - * Ihar Hrachyshka (be@latin) - * Petr Kovar (cs) - * Jorge González (es) - * Ivar Smolin (et) - * Iñaki Larrañaga Murgoitio (eu) - * Claude Paroz (fr) - * Seán de Búrca (ga) - * Yair Hershkovitz (he) - * Gabor Kelemen (hu) - * Kjartan Maraas (nb) - * Yannig Marchegay (Kokoyaya) (oc) - * Vladimir Melo (pt_BR) - * Vasiliy Faronov (ru) - * Matej Urbančič (sl) - * Daniel Nylander (sv) - * Clytie Siddall (vi) - -============== -Version 2.20.1 -============== - -Misc - - * Require GTK+ >= 2.11.1 (Sebastian Dröge) - -Translators - - * Ihar Hrachyshka (be@latin) - * Alexander Shopov (bg) - * Ilkka Tuohela (fi) - * Changwoo Ryu (ko) - -============== -Version 2.20.0 -============== - -Translators - - * Anas Husseini (ar) - * Jordi Mallach (ca) - * Ask Hjorth Larsen (da) - * NikosCharonitakis (el) - * Stéphane Raimbault (fr) - * Luca Ferretti (it) - * Artur Flinta (pl) - * Nickolay V. Shmyrev (ru) - * Peter Tuhársky (sk) - * Горан Ракић (sr) - -=============== -Version 2.19.92 -=============== - -Misc - - * Fix compiz support in gnome-wm (Kristian Hoegsberg) - -Translators - - * Andre Klapper (de) - * NikosCharonitakis (el) - * Adam Weinberger (en_CA) - * Ivar Smolin (et) - * Žygimantas Beručka (lt) - * Duarte Loreto (pt) - -=============== -Version 2.19.90 -=============== - -Translators - - * Inaki Larranaga Murgoitio (eu) - * Ankit Patel (gu) - * Andre Klapper (de) - * Jovan Naumovski (mk) - * Vladimir Melo (pt_BR) - * I. Felix (ta) - -============== -Version 2.19.6 -============== - -Misc - - * Have a better/smoother fadeout animation for logout dialog when - there's a compositing manager (Travis Watkins, Vincent) - * Add gnome-breakpad to GTK_MODULES if bug-buddy is present - (Fernando Herrera) - -Translators - - * Ilkka Tuohela (fi) - * Gabor Kelemen (hu) - * Takeshi AIHANA (ja) - * Wouter Bolsterlee (nl) - * Bharat Kumar (te) - * Yang Zhang (zh_CN) - -============== -Version 2.19.5 -============== - -Misc - - * Use g_option_context_set_translation_domain() (Vincent) - * Fix compilation not working on some dates... (Vincent) - -Translators - - * Tomasz Dominikowski (pl) - * Danishka Navin (si) - * Pavan Kumar (te) - * Clytie Siddall (vi) - -============== -Version 2.19.4 -============== - -Session Manager - - * Use g_timeout_add_seconds() when possible (Vincent) - * Improve a bit "wrong clock" check when the user has reconfigured his - clock (Vincent) - * Fix crash when icons on the splash screen needs to be relayout-ed - (Vincent) - * Fix compilation issue on Solaris (Vincent) - -Session Properties Dialog - - * Fix a crash when the comment for a .desktop file is not defined and a - startup program is disabled (Vincent) - -Misc - - * Require glib 2.13.0 - -Translators - - * Tshewang Norbu (dz) - -============== -Version 2.19.3 -============== - -Session Manager - - * Don't do logout fade if there's a compositing manager running - (Ray Strode, Bastien Nocera) - * Start accessibility if GNOME_ACCESSIBILITY is set (Wouter Bolsterlee, - Vincent) - -Session Properties Dialog - - * Small code cleanup (Vincent) - -Translators - - * David Lodge (en_GB) - * Jorge González (es) - * Ivar Smolin (et) - * Espen Stefansen (nb) - * Daniel Nylander (sv) - * Theppitak Karoonboonyanan (th) - -=============== -Version 2.19.2 -=============== - -Session Manager - - * Use g_usleep() instead of usleep() (Bastien Nocera) - * Don't hardcode start of assistive technologies software (Ariel Rios, - Vincent) - * Fix splash screen in RTL environments (Yair Hershkovitz) - * Improve splash screen on old displays (Fedora patch) - * Make it possible to use a shaped window for the splash screen - (Fedora patch, Vincent) - * Display the name of the started application in splash screen even if - there's no icon (Vincent) - * Don't use deprecated functions (Christian Persch, Vincent) - * Don't hardcode esound for the sound daemon (Matthias Clasen, Vincent) - * Make the fade on logout faster (Christof Krüger) - * Plug leaks (Vincent) - * Warn the user if he logs in as root (Vincent, Dan Winship) - * Warn the user if the clock is totally wrong and let him launch a - config tool (Vincent, Dan Winship) - * Change strings about saving the session to be more user-friendly - (Vincent) - * Remove workaround that chrooted esd to / (fixed in esd) (Vincent) - * Make it possible to save a session with multiple clients that are the - same program (Hans de Goede, Dan Winship) - * Use the new socket path for GDM (Loïc Minier) - -Session Properties Dialog - - * Use Add/Remove instead of New/Delete for handling startup programs - (Luca Ferretti) - * Show the comments in the startup programs list (Vincent) - * Change strings about saving the session to be more user-friendly - (Vincent) - * Make it possible to sort the program lists by clicking on the headers - (Vincent) - * Create a non-localized version of the Comment field in .desktop files - if necessary (Vincent) - -Misc - - * Remove xrdb check (Andreas Hanke) - * Build fixes (Andreas Hanke, Christian Persch) - * Require glib 2.12.0 (Vincent) - * Add --with-time-utility configure flag to set the executable that is - used to configure the time of the computer (Vincent) - * Don't require libgnome-desktop anymore (Vincent) - * Add support for beryl in gnome-wm (Alex) - -Translators - - * Peter Bach (da) - * Jorge González (es) - * Ivar Smolin (et) - * Iñaki Larrañaga Murgoitio (eu) - * Ignacio Casal Quinteiro (gl) - * Yair Hershkovitz (he) - * Espen Stefansen (nb) - * Yannig MARCHEGAY (Kokoyaya) (oc) - * Yang Zhang (zh_CN) - -=============== -Version 2.18.0 -=============== - -Session Manager - - * Drop legacy http_proxy support entirely since it is causing too - many issues (Ray Strode) - -Session Properties Dialog - - * Remove invalid category in .desktop file (Christian Kirbach) - -Translators - - * norbu (dz) - * Ankit Patel (gu) - * Luca Ferretti (it) - * Takeshi AIHANA (ja) - * Erdal Ronahi (ku) - * Gintautas Miliauskas (lt) - * Jovan Naumovski (mk) - * wadim dziedzic (pl) - * Og Maciel (pt_BR) - * Leonid Kanter (ru) - * Laurent Dhima (sq) - * Горан Ракић (sr) - * Maxim Dziumanenko (uk) - * Woodman Tuen (zh_HK) - -=============== -Version 2.17.92 -=============== - -Session Manager - - * Use the correct rate when a X resolution is configured - (Jens Granseuer) - * Don't exit when there's an unexpected dbus disconnection - (Jan de Groot) - -Session Properties Dialog - - * Update the category for the .desktop file - -Misc - - * Distribute MAINTAINERS (Kjartan Maraas) - -Translators - - * Alexander Shopov (bg) - * Jordi Mallach (ca) - * Hendrik Richter (de) - * Ivar Smolin (et) - * Ilkka Tuohela (fi) - * Gabor Kelemen (hu) - * Kjartan Maraas (nb) - * Wouter Bolsterlee (nl) - * Duarte Loreto (pt) - * Maxim Dziumanenko (uk) - * Funda Wang (zh_CN) - -=============== -Version 2.17.91 -=============== - -Session Manager - - * Increase timeout for starting at-spi-registryd. This should prevent - showing a window warning that accessibility won't work on slow - machines. (Frédéric Crozat) - * Hardcode start of assistive technologies software again since the - control center won't be ready for this in 2.18 (Vincent) - -Translators - - * Khaled Hosny (ar) - * Ihar Hrachyshka (be) - * Lasse Bang Mikkelsen (da) - * David Lodge (en_GB) - * Ivar Smolin (et) - * Ilkka Tuohela (fi) - * Claude Paroz (fr) - * Young-Ho Cha (ko) - * Kjartan Maraas (nb) - * Tino Meinen (nl) - * Og Maciel (pt_BR) - * Clytie Siddall (vi) - -================= -Version 2.17.90.1 -================= - -Misc - - * Fix installation of default.session (Vincent) - -=============== -Version 2.17.90 -=============== - -Session Manager - - * Kill the clients in reverse order of priority, which makes logging - out a better experience (metacity is killed last) (Tom Tromey) - * Remove useless code (Claudio Saavedra) - -Session Properties Dialog - - * Update categories in the .desktop file for the new control center - (Vincent) - * Use new icon (Vincent) - -Misc - - * Remove useless files and move some files in the module (Vincent) - * New session properties icon (Jakub Steiner) - -Translators - - * Khaled Hosny (ar) - * Hendrik Richter (de) - * David Lodge (en_GB) - * Daniel Nylander (sv) - * Theppitak Karoonboonyanan (th) - -============== -Version 2.17.5 -============== - -Misc - - * Add a configure option to specify the directory of at-spi-registryd - (Ariel Rios, Vincent) - * Build improvements (Vincent) - * Remove spec file (Vincent) - -Session Manager - - * Warn the user about more fatal errors (Tom Tromey) - * Use gtk-window-decorator for compiz (Vincent) - * Fix crash when two at-spi-registryd are running (Li Yuan) - * Don't hardcode start of assistive technologies software (Ariel Rios, - Vincent) - * Start the dbus daemon if it's not running (Julio M. Merino Vidal) - * Kill esd on exit (Loïc Minier) - * Fix priority order of autostart desktop files with the same name - (Vincent) - * Fix invalid use of memory (Tom Tromey) - * Fix quoting of commands when migration to new autostart system - (Tom Tromey) - -Session Properties Dialog - - * Fix priority order of autostart desktop files with the same name - (Vincent) - * Report connection errors more gracefully (Tom Tromey) - * Use GOption (Vincent) - * Reuse existing desktop files instead of overwriting them (Vincent) - * Rework code of edition of startup programs so that it actually works - well and comply with the freedesktop spec (Vincent) - * Use a toggle button to enable/disable startup programs (Vincent) - * Add a "Save current session" button (Josselin Mouette) - * Remove "ask to save" toggle button (Josselin Mouette) - * Remove edition of session names (Vincent) - * Remove splash screen toggle button (Vincent) - * Change order of the tabs (Vincent) - * Fix desktop file to use a correct icon (Vincent) - * Improve default size of the dialog (Vincent) - * Show names instead of commands for the startup programs (Vincent) - * HIGify quit dialog (Michael Terry, Vincent) - -Translators - - * Khaled Hosny (ar) - * Ihar Hrachyshka (be) - * Adam Weinberger (en_CA) - * David Lodge (en_GB) - * Francisco Javier F. Serrador (es) - * Ivar Smolin (et) - * Raivis Dejus (lv) - * Kjartan Maraas (nb) - * Eddy Petrișor (ro) - * Theppitak Karoonboonyanan (th) - * Clytie Siddall (vi) - -============== -Version 2.17.3 -============== - -Misc - - * Make it build on older distros (Vincent) - * Allow enabling/disabling tcpwrappers (Saleem Abdulrasool) - * Update man pages (Vincent) - -Session Manager - - * Fix bug where clicking logout button doesn't work if - mouse pointer happens to be on top of the button when - the window is mapped (bug 52047) (Ray Strode) - * Make treview searching search the right column - (Brent Smith) - * Get rid of init as the parent of all processes - (Tom Tromey) - * Add fading effect for the splash screen icons - (Daniel Godás) - * Add command line option to avoid confirmation dialog - on kill (William McCann) - * Add fvwm support (Ken Deeter) - * Add support for compiz (Vincent) - * Do less work if $WINDOW_MANAGER is set (Vincent) - * Set http_proxy variable correctly (Ray Strode) - * Don't set http_proxy variable at all if the proxy - requires authentication (Ray Strode) - -Translators - - * Daniel Nylander (sv) - -============== -Version 2.17.2 -============== - - Session Manager - - * Don't pop up useless dialog when saving session (Tom Tromey) - * Accept Enter key to close dialog when editing a session/startup - program (Tom Tromey) - * Set http_proxy environment variable based on GNOME settings - for legacy apps (Ray Strode) - * Launch at-spi-registryd for accessibility (Ariel Ros) - * Improve gnome-session-remove command line handling (Tom Tromey) - * Use Program instead of Command in the capplet (Tom Tromey) - - Misc - - * Check for libXau existence (Vincent, Frederic Peters) - * Add configure switch to disable esd support (Leonardo Boshell) - - Translators - - * Djihed Afifi (ar) - * Guillaume Savaton (eo) - * Ignacio Casal Quinteiro (gl) - * Åsmund Skjæveland (nn) - -============== -Version 2.16.1 -============== - - Misc - - * Updated man pages from Debian (Kjartan Maraas) - - Translators - - * Rostislav "zbrox" Raykov (bg) - * David Lodge (en_GB) - * Ivar Smolin (et) - * Luca Ferretti (it) - -============== -Version 2.16.0 -============== - - Misc - - * Updated splash screen (Andreas Nilsson, Vincent) - - Translators - - * Jordi Mallach (ca) - * Kostas Papadimas (el) - * Robert-André Mauchin (fr) - * Rajesh Ranjan (hi) - * Gabor Kelemen (hu) - * Gintautas Miliauskas (lt) - * Raivis Dejus (lv) - * Duarte Loreto (pt) - * Vasiliy Faronov (ru) - * Felix (ta) - -=============== -Version 2.15.92 -=============== - - Session Manager - - * Fix crash caused by debug output on Solaris (Brian Cameron) - - Translators - - * Rostislav "zbrox" Raykov (bg) - * Khandakar Mujahidul Islam (bn) - * Mindu Dorji (dz) - * Mate ORY (hu) - * Satoru SATOH (ja) - * Young-Ho Cha (ko) - * Artur Flinta (pl) - * Matic Žgur (sl) - * Daniel Nylander (sv) - * Maxim Dziumanenko (uk) - * Clytie Siddall (vi) - * Funda Wang (zh_CN) - -=============== -Version 2.15.91 -=============== - - Session Manager - - * Fix leaks (Rodrigo Moya, Vincent) - * Use GOption (Michael Terry) - * Make it possible to really disable the login sound (Vincent) - * Set the right parent window for an error dialog (Vincent) - * Update keyring daemon DISPLAY environment variable if it's already - running (Jon Nettleton) - * Fix sensitivity of edit/delete buttons when editing sessions - (Don Scorgie, Vincent) - * Add support for e16 window manager in gnome-wm (Kim Woelders) - * Fix edition of startup programs containing a space in a command line - argument (Vincent) - * Fix warning (Kjartan Maraas) - * Backward compatibility to run orca if gnopernicus is not available - and the gconf key is set to gnopernicus (Bill Haneman, Willie Walker) - - Misc - - * Add gnome-keyring dependency (Vincent) - - Translators - - * Runa Bhattacharjee (bn_IN) - * Rhys Jones (cy) - * Jochen Skulj (de) - * Francisco Javier F. Serrador (es) - * Priit Laes (et) - * Iñaki Larrañaga Murgoitio (eu) - * Ilkka Tuohela (fi) - * Ankit Patel (gu) - * Fano Rajaonarisoa (mg) - * Jovan Naumovski (mk) - * Ani Peter (ml) - * Kjartan Maraas (nb) - * Tino Meinen (nl) - * Subhransu Behera (or) - * A S Alam (pa) - * Evandro Fernandes Giovanini (pt_BR) - * Duarte Loreto (pt) - * Leonid Kanter (ru) - * Marcel Telka (sk) - * Jayaradha N (ta) - * Theppitak Karoonboonyanan (th) - * Woodman Tuen (zh_HK) - * Woodman Tuen (zh_TW) - -=============== -Version 2.15.90 -=============== - - Translators - - * Subhransu Behera (or) - -============== -Version 2.15.4 -============== - - Session Manager - - * Improve verbosity string (Glynn Foster) - * Fix critical warning when removing a client (Kjartan Maraas) - * Create autostart directory if it doesn't exist (Ray Strode) - * Give generated desktop filenames .desktop extension when encountering - naming conflicts (Ray Strode) - * Launch gnome-settings-daemon through dbus (Sergey Udaltsov) - - Misc - - * Use po/LINGUAS (Claudio Saavedra) - * Require intltool 0.35.0 (Vincent) - * Add gnome-settings-daemon (from gnome-control-center) dependency - (Sergey Udaltsov) - * Add dbus dependency (Vincent) - - Translators - - * Khandakar Mujahidul Islam (bn_IN) - * Guillaume Savaton (eo) - * Laurent Richard (fr) - * Young-Ho Cha (ko) - * Rahul Bhalerao (mr) - * Pablo Saratxaga (wa) - -============== -Version 2.15.1 -============== - - Session Manager - - * Use libgnomeui functions instead of libegg (Vincent) - * Fix "try again" dialog never disappearing (Frédéric Crozat) - * Fix crash in 64 bits computers (Joe Marcus Clarke) - * Reduce default verbosity (Fryderyk Dziarmagowski) - - Translators - - * Mindu Dorji (dz) - -============== -Version 2.14.1 -============== - - Session Manager - - * Share one GConfClient (Rodrigo Moya) - * Plug leaks (Kjartan Maraas) - - Translators - - * Ales Nyakhaychyk (be) - * Pema Geyleg (dz) - * Kostas Papadimas (el) - * Laurent Richard (fr) - * Gil Osher (he) - -============== -Version 2.14.0 -============== - - Session Manager - - * Support old directory for autostart .desktop files (Rodrigo) - * Fix leak (Rodrigo) - * Fix enabling/disabling of autostart services (Vincent) - - Misc - * New splash screen (Thomas Wood) - - Translators - - * Petr Tomeš (cs) - * Rhys Jones (cy) - * Martin Willemoes Hansen (da) - * Hendrik Richter (de) - * Ivar Smolin (et) - * Elnaz Sarbar (fa) - * Raivis Dejus (lv) - * Sebastian Ivan (ro) - * Daniel Nylander (sv) - * Maxim Dziumanenko (uk) - -=============== -Version 2.13.92 -=============== - - Session Manager - - * Fixes for writing the list of startup applications (Rodrigo Moya) - * Start gnome-settings-daemon as early as possible (Rodrigo Moya) - * Use $datadir/gnome/autostart for autostart .desktop file - (Rodrigo Moya) - - Translators - - * Ivar Smolin (et) - * Iñaki Larrañaga (eu) - * Mate ORY (hu) - * Luca Ferretti (it) - * Takeshi AIHANA (ja) - * Vladimer Sichinava (ka) - * Žygimantas Beručka (lt) - * Duarte Loreto (pt) - * Leonid Kanter (ru) - * Laurent Dhima (sq) - * Woodman Tuen (zh_HK) - * Woodman Tuen (zh_TW) - -=============== -Version 2.13.91 -=============== - - Session Manager - - * Really start vino asynchronously (Michael Meeks) - - Translators - - * Miloslav Trmac (cs) - * Ivar Smolin (et) - * Слободан Д. Средојевић (sr) - * Theppitak Karoonboonyanan (th) - * Wang Jian (zh_CN) - -=============== -Version 2.13.90 -=============== - - Session Manager - - * Add program autostart with .desktop files in known directories, - like /usr/share/autostart (Rodrigo Moya, Ray Strode) - - Misc - - * Depends on gnome-desktop-2.0 - - Translators - - * Rostislav "zbrox" Raykov (bg) - * Jordi Mallach (ca) - * Adam Weinberger (en_CA) - * Francisco Javier F. Serrador (es) - * Ivar Smolin (et) - * Ilkka Tuohela (fi) - * Ignacio Casal Quinteiro (gl) - * Ankit Patel (gu) - * Luca Ferretti (it) - * Kjartan Maraas (nb) - * Tino Meinen (nl) - * Kjartan Maraas (no) - * Evandro Fernandes Giovanini (pt_BR) - * Marcel Telka (sk) - * Theppitak Karoonboonyanan (th) - * Clytie Siddall (vi) - -============== -Version 2.13.5 -============== - - Misc - - * Set GTK+ modules to load so that all programs, even those started - early, use them (Muktha Narayan) - -============== -Version 2.13.4 -============== - - Misc - - * Make GNOME crash on critical warnings (Kjartan Maraas, Vincent Untz, - Federico Mena Quintero, Elijah Newren) - * Only run the reverse DNS check if necessary (Rodrigo Moya) - * Login speed improvements (Rodrigo Moya) - * New splash screen (Thomas Wood) - - Translators - - * Rostislav "zbrox" Raykov (bg) - * Khandakar Mujahidul Islam (bn) - * Kostas Papadimas (el) - * Priit Laes (et) - * Iñaki Larrañaga Murgoitio (eu) - * Erdal Ronahi (ku) - * Christian Rose (sv) - * Theppitak Karoonboonyanan (th) - * Clytie Siddall (vi) - -============== -Version 2.12.0 -============== - - Misc - - * New splash screen for GNOME 2.12 (Felix Dietze) - - Translators - - * Bryn Salisbury (cy) - * Francisco Javier F. Serrador (es) - * Christophe Merlet (RedFox) (fr) - * Gabor Kelemen (hu) - * Norayr Chilingaryan (hy) - * Mohammad DAMT (id) - * Žygimantas Beručka (lt) - * Duarte Loreto (pt) - * Sebastian Ivan (ro) - * Leonid Kanter (ru) - * Baris Cicek (tr) - * Maxim Dziumanenko (uk) - -=============== -Version 2.11.91 -=============== - - Fixes - - * Fix rendering of splash screen text (Ray Strode) - * Fix RandR support to correctly use host settings (Sebastien Bacher) - - Translators - - * GNOME PL Team (pl) - * Wang Jian (zh_CN) - * Woodman Tuen (zh_TW) - -=============== -Version 2.11.90 -=============== - - Fixes - - * Fix some memory leaks (Aivars Kalvans, Federico) - * Make the session capplet have a window icon (Jaap A. Haitsma) - * Don't set deprecated default window manager key in gnome-wm (Mark) - - Misc - - * Remove gnome-smproxy (Mark) - See: http://mail.gnome.org/archives/desktop-devel-list/2005-July/msg00527.html - - Translators - - * Rostislav "zbrox" Raykov (bg) - * Martin Willemoes Hansen (da) - * Hendrik Richter (de) - * Priit Laes (et) - * Ilkka Tuohela (fi) - * Ignacio Casal Quinteiro (gl) - * Norayr Chilingaryan (hy) - * Takeshi AIHANA (ja) - * Kjartan Maraas (nb) - * Shiva Prasad Pokharel (ne) - * Kjartan Maraas (no) - * Marcel Telka (sk) - * Laurent Dhima (sq) - * Данило Шеган (sr) - * Theppitak Karoonboonyanan (th) - * Clytie Siddall (vi) - * Woodman Tuen (zh_TW) - -============== -Version 2.11.1 -============== - - Misc - - * Remember the last chosen logout action (Carlos Garnacho Parro) - * Clean up the ICE code slightly (Iain Holmes) - - Translators - - * Jordi Mallach (ca) - * Miloslav Trmac (cs) - * Frank Arnold (de) - * Kostas Papadimas (el) - * Adam Weinberger (en_CA) - * Francisco Javier F. Serrador (es) - * Priit Laes (et) - * Elnaz Sarbar (fa) - * Ankit Patel (gu) - * Hasbullah Bin Pit (ms) - * Tino Meinen (nl) - * Evandro Fernandes Giovanini (pt_BR) - * Steve Murphy (rw) - * Baris Cicek (tr) - * Pablo Saratxaga (wa) - -============== -Version 2.10.0 -============== - - Misc - - * New splash screen (Sami "alump" Viitanen) - * Improved schemas string (Byran Clark, Kjartan Maraas) - - Translators - - * Vladimir \"Kaladan\" Petkov (bg) - * Jordi Mallach (ca) - * Miloslav Trmac (cs) - * Martin Willemoes Hansen (da) - * Frank Arnold (de) - * Kostas Papadimas (el) - * Adam Weinberger (en_CA) - * David Lodge (en_GB) - * Francisco Javier F. Serrador (es) - * Ivar Smolin (et) - * Pauli Virtanen (fi) - * Christophe Merlet (RedFox) (fr) - * Ankit Patel (gu) - * Gil Osher (he) - * Gabor Kelemen (hu) - * Luca Ferretti (it) - * Takeshi AIHANA (ja) - * Changwoo Ryu (ko) - * Žygimantas Beručka (lt) - * Kjartan Maraas (nb) - * Tino Meinen (nl) - * Åsmund Skjæveland (nn) - * Kjartan Maraas (no) - * GNOME PL Team (pl) - * Evandro Fernandes Giovanini (pt_BR) - * Duarte Loreto (pt) - * Mişu Moldovan (ro) - * Leonid Kanter (ru) - * Marcel Telka (sk) - * Laurent Dhima (sq) - * Данило Шеган (sr) - * Christian Rose (sv) - * Theppitak Karoonboonyanan (th) - * Maxim Dziumanenko (uk) - * Simon Kemisho (xh) - * Wang Jian (zh_CN) - * Woodman Tuen (zh_TW) - -============= -Version 2.9.4 -============= - - Session Manager - - * Use GDM's logout actions protocol to shutdown/reboot (Raffaele Sandrini, Mark) - * Change "Prompt" to "Ask" in the configuration dialog (Vincent Noel) - * Fix compiler warnings (Jens Granseuer) - * Slave the lifecycle of the keyring daemon to the session (Alex Larsson) - - Translators - - * Jordi Mallach (ca) - * Miloslav Trmac (cs) - * Adam Weinberger (en_CA) - * Francisco Javier F. Serrador (es) - * Kjartan Maraas (nb) - * Kjartan Maraas (no) - * Laurent Dhima (sq) - * Christian Rose (sv) - * Zuza Software Foundation (zu) - -============= -Version 2.9.2 -============= - - Misc - - * Add X-GNOME-Bugzilla-Version to .desktop file (Christoffer Olsen) - * Install .desktop file in $(datadir)/applications (Mark) - - Translators - - * Martin Willemoes Hansen (da) - * Zuza Software Foundation (nso) - -============= -Version 2.8.1 -============= - - Session Manager - - * Don't crash gnome-session-remove if we can't get a program name (Ray Strode) - * Add a big bunch of debug spew (Federico) - * Don't leak the splash screen background image (Kjartan) - * Remove the purge timeout when re-incarnating a client (Federico) - - Misc - - * Use automake 1.7 (James Henstridge) - - Translators - - * Adam Weinberger (en_CA) - * Changwoo Ryu (ko) - -============= -Version 2.8.0 -============= - - Session Manager - - * New splash screen (Jakub Steiner) - - Translators - - * Miloslav Trmac (cs) - * Adam Weinberger (en_CA) - * Priit Laes (et) - * Jesús Bravo Álvarez (gl) - * Gabor Kelemen (hu) - -============== -Version 2.7.92 -============== - - Session Manager - - * Fix various warnings, deprecated API usage etc. (Kjartan Maraas) - - Translators - - * Kemal Sanjta (bs) - * Kjartan Maraas (nb) - * Laurent Dhima (sq) - * Maxim Dziumanenko (uk) - -============== -Version 2.7.91 -============== - - Session Manager - - * Add support for activating Vino (Mark) - - Translators - - * Kartik Mistry (gu) - -============= -Version 2.7.4 -============= - - Fixes - - * Fix the fadeout at logout on Xinerama (Bastien Nocera) - - Translators - - * Pawan Chitrakar (ne) - -============= -Version 2.7.3 -============= - - Fixes - - * Don't start a keyring if one is already available (Alex Larsson) - * Fix minor text drawing issue with the slash screen - (Carlos Romero, Simone Gotti) - - Translators - - * Evandro Fernandes Giovanini (pt_BR) - * Laurent Dhima (sq) - * zhakanini (ta) - -============= -Version 2.7.1 -============= - - Translators - - * Reinout van Schouwen (nl) - -============= -Version 2.6.1 -============= - - Fixes - - * Fix a crash with the logout dialog on multi-screen setups (Mark) - - Translators - - * Zuza Software Foundation (af) - * Hizkuntza Politikarako Sailburuordetza (eu) - * Guntupalli Karunakar (gu) - * John C Barstow (mi) - -============= -Version 2.6.0 -============= - - Translators - - * Alexander Winston (en_CA) - * Gareth Owen (en_GB) - * Jitendra Shah (mr) - * Mişu Moldovan (ro) - * Leonid Kanter (ru) - -============== -Version 2.5.92 -============== - - Translators - - * Vladimir \"Kaladan\" Petkov (bg) - * Dinesh Nadarajah (ta) - * Maxim Dziumanenko (uk) - -============== -Version 2.5.91 -============== - - Session Manager - - * New splash screen for 2.6 (Jakub Steiner) - * Make the capplet use GtkFileChooser (Chris Kelso) - - Translations - - * Mətin Əmirov (az) - * Laszlo Dvornik (hu) - * Christopher R. Gabriel (it) - * Amanpreet Singh Alam (pa) - * Paisa Seeluangsawat (th) - -============== -Version 2.5.90 -============== - - Translations - - * Laurent Dhima (sq) - * Paisa Seeluangsawat (th) - -============= -Version 2.5.5 -============= - - Session Manager - - * Set accessible role on the logout dialog (Padraig) - * Update help links to the new user-guide location (Mark) - - Session Properties Dialog - - * Make Escape actually with the warning dialog (Bala) - * Don't warn user about discarding changes if no changes have been made (Bala) - - Translators - - * Changwoo Ryu (ko) - * Robert Sedak (hr) - * Maxim Dziumanenko (uk) - -============= -Version 2.5.4 -============= - - Session Manager - - * Don't show silly icon when we can't find an splash icon (Glynn) - * Update the icon map (Luca Ferretti) - * Fix usage of deprecated function (Kjartan) - - Misc - - * Fix issue with underquoted definition of AM_PATH_ESD (Alexander Winston) - * Kill unused .desktop file (Mark) - * Update support for lwm (James F. Carter) - * Add support for openbox (Michael Terry) - - Translators - - * Kjartan Maraas (no) - * Laurent Dhima (sq) - * Miloslav Trmac (cs) - * Mətin Əmirov (az) - * Reinout van Schouwen (nl) - -============= -Version 2.5.3 -============= - - Session Manager - - * Fix lock-up on log out with glib 2.3.1 (Mark) - * Use a managed window for the logout dialog when accessibility - is enabled (Mark, Bill Haneman) - * Require gtk+ 2.3.x and dump the pangox coverage cache hack (Mark) - - Translators - - * Duarte Loreto (pt) - * Isam Bayazidi (ar) - * Paul Duffy (ga) - * Sanlig Badral (mn) - -============= -Version 2.5.2 -============= - - Session Manager - - * Start the gnome-keyring daemon at login (Alexander Larsson) - * Shut down the GConf daemon at logout (W. Michael Petullo, Mark) - * Don't set the full path of the splash screen in GConf (Mark) - - Translators - - * Kostas Papadimas (el) - * Paisa Seeluangsawat (th) - -============= -Version 2.5.1 -============= - - Misc - - * Add a --enable-deprecations build flag (Mark) - - Translators - - Dafydd Harries (cy) - Miloslav Trmac (cs) - -============= -Version 2.4.1 -============= - - Translators - - Åsmund Skjæveland (nn) - Evandro Fernandes Giovanini (pt_BR) - Žygimantas Beručka (lt) - -============= -Version 2.4.0 -============= - - Translators - - Joël Brich (eo) - Mişu Moldovan (ro) - Nikos Charonitakis (el) - Paisa Seeluangsawat (th) - -============== -Version 2.3.90 -============== - - Translators - - Christian Rose (sv) - Dafydd Harries (cy) - Francisco Javier F. Serrador (es) - Jordi Mallach (ca) - Mujahidul Islam (bn) - Reinout van Schouwen (nl) - -============= -Version 2.3.7 -============= - - Session Manager - - * Funky new splash screen (Jakub Steiner) - - Translators - - Changwoo Ryu (ko) - Kjartan Maraas (no) - Mətin Əmirov (az) - Sanlig Badral (mn) - Stanislav Visnovsky (sk) - Tõivo Leedjärv (et) - Данило Шеган (sr) - -=============== -Version 2.3.6.2 -=============== - - Session Manager - - * Fix warnings on startup (Mark) - - Translators - - Takeshi AIHANA (ja) - -=============== -Version 2.3.6.1 -=============== - - Session Manager - - * Workaround problem where smproxy was causing gnome-session to save itself - as part of the session (Mark, Malcolm Tredinnick, Fredrik Jönsson) - * Plug a memory leak (Frederic Crozat) - - Translators - - Anurag Seetha (hi) - Hasbullah Bin Pit (ms) - Laurent Dhima (sq) - -============= -Version 2.3.6 -============= - - Session Manager - - * Various HIG fixes to logout and session properties dialogs (Dennis Cranston) - * Add patch to point applications at a GTK+ 1.2 rc file which - the settings modifies (Jonathan Blandford) - - Translators - - Ales Nyakhaychyk (be) - Christophe Merlet (RedFox) (fr) - Duarte Loreto (pt) - Evandro Fernandes Giovanini (pt_BR) - Kostas Papadimas (el) - Pablo G. del Campo (es) - Reinout van Schouwen (nl) - Wang Jian (zh_CN) - -============= -Version 2.3.4 -============= - - Session Manager - - * Add IPv6 support (Shailesh Mittal) - - Misc - - * Remove old docs cruft (John Fleck) - - Translators - - Abel Cheung (zh_TW) - Andras Timar (hu) - Christian Neumair (de) - Jeroen van der Vegt (nl) - Mətin Əmirov (az) - Данило Шеган (sr) - -=============== -Version 2.3.3.1 -=============== - - * Add support for launching assistive technologies (Bill Haneman) - * HIG fixes for the logout dialog (Dennis Cranston) - * Reduce flicker in logout effect (Anders) - * Make the splash screen no be override redirect (Havoc) - * Only allow numeric values in spin buttons (Pasupathi Duraisamy) - * Enabled "Edit" and "Delete" buttons only if something is actually - selected (Balamurali Viswanathan) - - Translators - - * Abel Cheung (zh_TW), Arman Aksoy (Armish) (tr), Christian Rose (sv), - Christophe Merlet (RedFox) (fr), Christopher R. Gabriel (it), - Dafydd Harries (cy), Dmitry G. Mastrukov (ru), Gil 'Dolfin' Osher (he), - GNOME PL Team (pl), Jeroen van der Vegt (nl), Joël Brich (eo), - Jordi Mallach (ca), Kjartan Maraas (no), Laurent Dhima (sq), - Miloslav Trmac (cs), Ole Laursen (da), Pablo Gonzalo del Campo (es), - Pauli Virtanen (fi) and Samuel Jon Gunnarsson (is). - -============= -Version 2.3.3 -============= - - * Add gnome-session-remove command line utility (Mark) - * Funky new 2.3.x splash screen (Jeff Waugh) - * Fix crash with logout dialog (Jon Svendsen) - * Remove gnome-terminal from the default session (Bala) - * Remove linc usage (Michael) - * Port gnome-session-properties to GtkDialog (silversides AT btinternet.com) - -Translators - - * Dafydd Harries (cy.po), Dinesh Nadarajah (ta.po), Jordi Mallach (ca.po), - Miloslav Trmac (cs.po) and Paul Duffy (ga.po). - -============= -Version 2.3.2 -============= - - * Allow changing current session with gnome-session-save (Mark) - * s/guint/GtkType (Aron Griffis) - * Fix MAXHOSTNAMELEN usage in smproxy (Julio Merino) - -Misc - - * Fix sgmldocs.make and xmldocs.make (Art Haas) - * Cygwin fixes (Masahiro Sakai) - -Translations - - * Abel Cheung (zh_TW), Christian Rose (sv), Danilo Šegan (sr, sr@Latn), - Duarte Loreto (pt) and Telsa Gwynne (cy). - -============= -Version 2.3.1 -============= - - * Primitive customization for icons on startup. (Sergey) - * Xrandr support (Alexander Larsson) - -Translations - - * bn(Taneem Ahmed), fa(Roozbeh Pournader), ga(Paul Duffy) - mn(Sanlig Badral), ms(Hasbullah Bin Pit) - -============= -Version 2.3.0 -============= - - * New logout effect (Iain Holmes, Mark) - * Fix hang with multiple apps requesting interaction (Arvind) - * Implement muli-screen support for logout help (Bala, Mark) - * Test wrapper for testing out logout effects (Mark) - * Warning fixes (Mark) - -Translations - - * az(Metin Amiroff), be(Belarusian team), fa(Roozbeh Pournader), - hi(Gnome Hindi Team), ml(FSF-India) and wa(Pablo Saratxaga). - -============= -Version 2.2.2 -============= - - * Fix gnome-session hanging when multiple apps request - interaction (Arvind) - -Translations - - * Ankur Group (bn), Danilo Å egan (sr), FSF_India (ml) - Guntupalli Karunakar (hi), Miloslav Trmac (cs) and - Sanlig Badral (mn). - -============= -Version 2.2.1 -============= - - * Honour the --disable-schemas-install configure option (Julio Merino) - * Support themeing of the icons on the splash screen (Havoc Pennington) - -Translations - - * Dmitry G. Mastrukov, Fatih Demir, Metin Amiroff, Miloslav Trmac, - Mohammad Damt, Pramod, Roozbeh Pournader, Takeshi AIHANA and - Vincent van Adrighem. - -=============== -Version 2.2.0.2 -=============== - - * Build fix (Thomas Vander Stichele) - * Mark a couple of strings for translation (Yuriy Syrota) - -Translations - - * Abel Cheung, Alessio Frusciante, Alexander Shopov, Andras Timar, - Artis Trops, Bayarsaihan, Christian Neumair, Christian Rose, - Christophe Fergeau, Daniel Yacob, Deep_Dark, Dmitry G. Mastrukov, - Duarte Loreto, Evandro Fernandes Giovanini, Jordi Mallach, - Kang Jeong-Hee, Kjartan Maraas, Kostas Papadimas, Ole Laursen, - Pablo Gonzalo del Campo, Pauli Virtanen, Sanlig Badral, - Stanislav Visnovsky, Vincent van Adrighem and Zbigniew Chyla. - -=============== -Version 2.2.0.1 -=============== - - * Cool new splash screen (Jakub Steiner) - -Translations - - * Dmitry G. Mastrukov. - -============= -Version 2.2.0 -============= - -Translations - - * Daniel Yacob, Deep_Dark, Dmitry G. Mastrukov, Fatih Demir, - Kang Jeong-Hee, Pablo Gonzalo del Campo and Pablo Saratxaga. - -============== -Version 2.1.90 -============== - -Session Manager - - * Up the slow client purge delay to 2 minutes (Mark) - * Fix GsmProtocol initialisation problem (Mark) - -Session Manager Configuration Dialog - - * Ensure child dialogs are kept above the parent (Satyajit) - -Translations - - * Abel Cheung, Alexander Shopov, Artis Trops, German Poo Caaman~o, Jordi - Mallach, Pablo Saratxaga, Stanislav Visnovsky and Zbigniew Chyla. - -============= -Version 2.1.5 -============= - -Miscellanous - - * Add startup notification flag to .desktop files (Dennis Cranston) - -Translations - - * Christian Neumair, Christophe Merlet, Hasbullah Bin Pit, - Kostas Papadimas and Vincent van Adrighem. - -============= -Version 2.1.4 -============= - -Session Manager - - * Unref the GConfCliet (Brian Cameron) - * Add X-GNOME-BUGZILLA to the .desktop files (Fernando Herrera) - -Miscellanous - - * Fixup manpages (Christian Marillat, Mark, Alex Duggan) - -Translations - - * Andras Timar, Christian Rose, Evandro Fernandes Giovanini, - He Qiangqiang, Kjartan Maraas, Marius Andreiana, - Maxim Dzumanenko, Ole Laursen and Pauli Virtanen. - -============= -Version 2.1.3 -============= - - * Update application icons map (Evandro Fernandes Giovanini) - -Translations - - * Christian Neumair, Christopher R. Gabriel, Dmitry G. Mastrukov, - Fatih Demir, Kjartan Maraas, Ole Laursen, Tõivo Leedjärv, - Vincent van Adrighem and Yanko Kaneti. - -============= -Version 2.1.2 -============= - - * Fixup Xinerama aware logout iris code (Mark) - -Translations - - * Andras Timar, Daniel Yacob, Dmitry G. Mastrukov and - Kjartan Maraas. - -============= -Version 2.1.1 -============= - - * Allow splash screen to be configured (Rodney Dawes) - * Use intltool to merge schmemas translations (Mark) - -============= -Version 2.1.0 -============= - - * Use metacity for the window manager by default (Jacob) - * Multiscreen support for logout iris and dialog (Mark) - * Use "Order" instead of "Priority" in the capplet (Mark) - -Translations - - * German Poo-Caamaño, Gustavo Noronha Silva, Marius - Andreiana and Naba Kumar. - -============= -Version 2.0.8 -============= - -Session Manager - - * Don't grab the Xserver on logout with ally (Padraig) - * Fix bug with splash screen layout (Jacob) - * Start esd if enable_esd is set event if enable_sounds isn't (Mark) - -Configuration Dialog - - * Don't allow setting negative values for client priority (Mark) - * Don't ask to confirm saving after changes have been applied (Mark) - * Fix bogus warning about session name already existing (Matt Brubeck) - -Translations - - * Abel Cheung, Anurag Seetha, Gil 'Dolfin' Osher, He Qiangqiang, - Michal Bukovjan and Pablo Gonzalo del Campo. - -============= -Version 2.0.7 -============= - -Translations - - * He Qiangqiang. - -============= -Version 2.0.6 -============= - -Session Management Proxy - - * Define NI_MAXHOST if not defined (Ryan Lovett) - -Miscellanous - - * Fixup the .desktop files (Ross Burton) - -Translations - - * Andras Timar, Christian Meyer, Duarte Loreto, Marius - Andreiana, Peteris Krisjanis, Roozbeh Pournader and - Simos Xenitellis. - -============= -Version 2.0.5 -============= - -Session Management Proxy - - * Fix crashing when starting emacs, #89968 (Mark) - -============= -Version 2.0.4 -============= - -Session Manager - - * Amend a Global save to Both if user selects save session (Mark) - * Capplet saving state fix (Stephen Browne) - -Translations - - * Gustavo Noronha Silva, Manuel Borchers, Tõivo Leedjärv and - Vincent van Adrighem . - -============= -Version 2.0.3 -============= - -Session Manager - - * Re-write the splash screen to not use the canvas (Michael) - * Fix crash with logout dialog (Jacob) - * Make file selector when editing startup programs modal (Federico) - * Increased initial client timeout to 30 seconds (Arvind Samptur) - -Miscellanous - - * Remove redundant man pages (Mark) - -Translations - - * Changwoo Ryu, Dmitry G. Mastrukov, Kjartan Maraas, Pablo Saratxaga, - Pauli Virtanen, Stanislav Visnovsky, Takayuki KUSANO, Yanko Kaneti and - Zbigniew Chyla. - -============= -Version 2.0.2 -============= - -Session Manager - - * Play login and logout sounds (Jacob) - * Start gnome-settings-daemon using bonobo-activation (Jacob) - * Cruft removal from configuration dialog (Mark) - * Remove gnome-login-check (Jacob) - * Use absolute path for rsh (Mark) - * Set focus on logout dialog explicitly (Jacob) - * Quit configuration dialog on SM die signal (Jacob) - * UI consistency string changes (Glynn) - * Finish drawing iris properly (Alvaro Lopez Ortega) - * Support alternate locations of esd and gconf-sanity-check (Brian Cameron) - * Configuration dialog UI cleanup (Stephen Browne) - - -X11R5 Session Management Proxy - - * Don't link against all of gnome-libs (Jacob) - * Support CDE app's broken reliance on non-standard root window properties (Mark) - * Use XGetWMName instead of XFetchName for WM_NAME (Mark) - * Various buffer overflow precautions (Mark) - * Refuse to use a world writeable directory (Mark) - * Loosen constraint very vaguely imposed by ICCCM (Mark. - -Miscellanous - - * Configure checks updates (Jacob, Mark, Brian Cameron) - * Fix various compile warnings (Mark) - * Add encoding field to .desktop files (George) - -Translations - - * Abel Cheung, Carlos Perello Marin, Changwoo Ryu, Christian Rose, - Christophe Fergeau, Daniel Yacob, Dmitry G. Mastrukov, Hasbullah Bin Pit, - Jordi Mallach, Kjartan Maraas, Ole Laursen, Peteris Krisjanis, Stanislav - Visnovsky, Tõivo Leedjärv, Vincent van Adrighem, Yanko Kaneti and - Zbigniew Chyla. - -============= -Version 2.0.1 -============= - -Translations - - * Jordi Mallach, Takayuki KUSANO and Yanko Kaneti. - -============= -Version 2.0.0 -============= - -gnome-session - - * Run gconf-sanity-check at login (Havoc) - * Fix DiscardCommand usage with autosave (Jacob, Gustavo Giráldez) - * Handle InteractRequests in phase 2 correctly (Jacob) - * Use correct locale directory (HideToshi Tajima) - * Fix crash on session save (Jacob) - -Translations - - * Carlos Perelló Marín, Christophe Merlet, Dmitry G. Mastrukov, - Hasbullah Bin Pit and Pablo Saratxaga. - -============== -Version 1.5.21 -============== - -gnome-session - - * Allow InteractRequests in phase 2 (Jacob) - * Made help button point at user guide (Satyajit Kanungo) - -Translations - - * Carlos Perelló Marín, Christian Rose, Duarte Loreto, George Lebl, - Jesus Bravo Alvarez, Tõivo Leedjärv and Vincent van Adrighem. - -============== -Version 1.5.20 -============== - -gnome-session - - * Add help button which points to soon-to-be-added docs (Satyajit Kanungo) - * Use DiscardCommand properly so as to not leak data (Mark) - * Revert logout dialog back to OK_CANCEL (Mark) - * Kill libice check program (Jacob) - * Use the Default session if session name is empty (Jacob) - * Fix logout shading not dissapearing on Solaris (Jacob) - * Make 'Order' combo in Session Properties work (Jacob) - -smproxy - - * Add workaround for broken CDE applications (Mark) - -Translations - - * Abel Cheung, Changwoo Ryu, Dmitry G. Mastrukov, Ivan Stojmirov, - Kjartan Maraas, Naba Kumar, Ole Laursen, Pablo Saratxaga, - Pauli Virtanen, Stanislav Visnovsky, Szabolcs Ban, Vlad Harchev - and Zbigniew Chyla. - -============== -Version 1.5.19 -============== - -gnome-session - - * Use GConf for autosave, logout prompt, splash screen (Jacob) - * Listen for tcp settings (Jacob) - * Remove 'Browse Current Session' button from dialog (Jacob) - * Add some funky new schemas (Jacob) - * Clean up ice code to make it work (Jacob) - * Clean up session manager code to make it work (Jacob) - * Add some msm cut and paste (Jacob) - -misc - - * Build fixes (Jacob) - -Translations - - * Stanislav Visnovsky, Ole Laursen, Pablo Saratxaga, - Abel Cheung, Changwoo Ryu, Zbigniew Chyla, Kjartan Maraas, - Gediminas Paulauskas, , Christophe Fergeau, Duarte Loreto, - Takayuki KUSANO. - -============== -Version 1.5.18 -============== - -gnome-session - - * Make logout dialog keyboard accessible (Glynn, Jacob) - * Don't allow more than one instance of gnome-session (Tom) - -Translations - - * Ilmar Kerm, Benedikt Roth, Zbigniew Chyla, Ole Laursen, - Fatih Demir, Pablo Saratxga. - -============== -Version 1.5.17 -============== - -gnome-session - - * Change logout buttons (Mark, Dennis M. Cranston, Murray Cumming) - * Update splash screen icon table (Mark) - * Accessibility patch (Jacob) - -Misc - - * Update library requirements (Mark) - -Translations - - * Abel Cheung, Changwoo Ryu, Christophe Merlet, Kjartan Maraas, - Pauli Virtanen, Simos Xenitellis, Vincent van Adrighem and - Zbigniew Chyla. - -============== -Version 1.5.16 -============== - - * Port from CList to TreeView (Jacob) - * Update gnome-settings-daemon name (Jonathon) - * Fix splash screen font description (Changwoo Ryu) - -Translations - - * Valek Filippov, Hasbullah Bin Pit, Abel Cheung, - Stanislav Visnovsky, Changwoo Ryu, Ole Laursen and - Zbigniew Chyla. - -============== -Version 1.5.15 -============== - - * don't include capplet-widget.h (Mark) - -============== -Version 1.5.14 -============== - - * Port of session-properties-capplet to 2.0 (Lauris) - * Fix session-properties crash, #76888 (Mark) - * Fix invalid errno assumptions, #52781 (Mark) - * Ask nautilus not to open a window at startup (Frederic Crozat) - -Translations - - * Abel Cheung, Gediminas Paulauskas, Kjartan Maraas and - Tõivo Leedjärv - -============== -Version 1.5.13 -============== - - * Various porting to non-deprecated apis (Mark) - * Correctly install capplet .desktop files (Arvind) - * Port GsmSession, GsmProtocol and GsmClient to GObject (Mark) - * Use glib-mkenums to build enum GTypes for signals (Mark) - * Built sources build fix (Jacob) - * Copy pango XGrabServer workaround from metacity (Mark, Owen) - * Fix logout dialog crash (Mark) - -============== -Version 1.5.12 -============== - - * new spec file (Chris Chabot) - * link explicitly against X if pango doesn't (Shivram U) - * make everything build without warnings (Mark) - * update for panel executable change (Glynn) - -Translations - - * Changwoo Ryu, Christian Meyer, Christopher R. Gabriel, - Duarte Loreto, Fatih Demir, Kjartan Maraas, Ole Laursen, - Pauli Virtanen, Roy-Magne Mo, Stanislav Visnovsky, Szabolcs - Ban, Tõivo Leedjärv and Valek Filippov. - -============== -Version 1.5.11 -============== - - * make reboot/halt command configurable (Laszlo Peter) - * remove irrelevant manpages (Mark) - * default.in fix (Jonathon) - -Translations - - * Christian Rose, Zbigniew Chyla, Hasbullah Bin Pit - and Wang Jian - -============== -Version 1.5.10 -============== - - * removal of gtk_widget_(push|pop)_visual calls (Kjartan) - * more default session work (Jacob) - * upd session capplet .desktop file (Seth) - -Translations - - * Tõivo Leedjärv and Christophe Merlet. - -============= -Version 1.5.9 -============= - - * split from gnome-session from gnome-core (Mark) - * default session updates (Jonathan) - -============= -Version 1.5.8 -============= - -Panel - * Plug an atrocious amount of leaks (Mark) - * Load applets in an idle handler (Mark) - * Use the correct repository ID for applets (Mark) - * Use the all the applet moniker items (Mark) - * Lots more keynav work (Padraig) - * Menu properties saving to gconf (Mark) - * Solaris mis-alignment bugfix (Mark) - * Use bonobo-activation per-display registration (Mark) - * Menu Panel clock translation fixage (Takayuki KUSANO) - * Event stretching cleanup (Mark) - * struts hints fixing (Havoc) - * Applet saving fixes (Mark) - * Fix applet popup menu (Richard Hult) - * Run dialog box fixes (Mark, George) - * .desktop file charset conversion fix (Gediminas Paulauskas) - * Lots of menu work (George) - * remove cruft from Panel idl (Mark) - * fix build (Jacob) - -Panel Applet Library - - * generic applet flags api (Mark) - * use GConfClient to kill gconf warnings (Mark, Gediminas) - * allow PanelApplet to be derived from (Mark) - * item handler for initial size, orient and background (Mark) - * applet developer's testing utility (Mark) - * panel_applet_get_background implementation (George, Mark) - * plug leak (Mark) - * applet focus (Padraig) - * shift+F10 applet menu popup (Padraig) - * kill getExpandFlags idl (Mark) - * build fix (Jacob) - -Applets - * tasklist and pager prefs dialog button fix (Jorn Baayen) - * updates for libpanel-applet changes (Mark) - * initial applets size and orient fixage (George) - -Docs - * tasklist, pager, mailcheck and clock docs (John Fleck) - * man pages (Christian Marillat, Kjartan) - -Misc - * remove gnome-terminal from build (Mark) - * .desktop files fixing (Mark) - * distcheck fixes (Mark) - * use intltool to translate .desktop files (Gediminas) - * plug libgnome-desktop leaks (Mark) - * gsm build fix (Jacob) - * logout dialog box usability fix (Gediminas) - * gnome-login-check dns simplification (Mark) - * include config.h in translatable files (Kjartan) - -Translations - * Gediminas Paulauskas, Duarte Loreto, Kjartan Maraas, Ole Laursen, - Pauli Virtanen, Hasbullah Bin Pit, Takayuki KUSANO, Changwoo Ryu - and Duarte Loreto. - -============= -Version 1.5.7 -============= - -Applets - * pager docoumentation setup (John Fleck) - * applet .directory files removal (Mark) - * fish about dialog bugfix (Mark) - * usability re-naming (Seth) - * desktop file culling and fixing (Seth) - - -Panel - * launcher saving bugfixes (Mark) - * Lots of excellant panel keynav work (Padraig) - * make glade/intltool work together (Darin, Mark) - * make run dialog global key work again (George) - * authors list update (George) - * re-enable applet dnd (George) - * fix build breakage (Glynn) - -Misc - * ditem error handling improvement (George) - * gsm 'double delete' bugfix (Kjartan) - -============= -Version 1.5.6 -============= - - * rationalise gconf source autoconf check (Mark) - * workaround deprecated gtk+ enums usage (Mark) - -============= -Version 1.5.5 -============= - -gnome-core/applets - - * Make time/date centered for Clock applet [Richard] - * Usability applet renaming [Seth] - * Misc build fixes [Glynn] - -gnome-core/gnome-desktop - - * Misc fixes [George, Stephen] - -gnome-core/icons - - * 7 new icons! Can you *see* the love? [Seth, Jakub] - -gnome-core/libpanel_applet - - * Misc fixes [Mark] - * Build fixes [Glynn] - -gnome-core/panel - - * ButtonWidget now inherits from GtkButton [Padraig] - * Implement support for popup menus using 'Shift+F10' [Padraig] - * Remove last trace of tiles like ever [George] - * Draw focus frame around launchers [George] - * Implement retrun focus from a child widget using - 'Ctrl+Tab' [Padraig] - * Port status and swallow applets to use libwnck [George] - * Give panel prelight colour when panel has focus [Padraig] - * Usability rewording and new icons [Seth] - * Save the world with sensible context menus [Seth] - * Fix up default panel schemas [Glynn, Seth] - * Remove caveat dialog [George] - * Give focus to launcher instead of hidebuttons first [Padraig] - * Lower button displacement [Anders] - * Fix panel boundaries [George] - * Synchronize panel hints with GNOME 1.4 [Roy-Magne Mo] - * Implement keyboard move functionality of - ButtonWidget [Padraig] - * De-sensitize basep widget when hidden [George] - * Misc fixes [Anders, George, Glynn, Padraig] - * Cleanage of severe cruft [George, Padraig] - * Much panel fear [George] - -gnome-core/docs - - * We now have documentation! [John] - * Build fixes [Mark] - -gnome-core/po - - * Translations [Christian Rose, Hasbullah Bin Pit, - Kjartan Maraas, Marius Andreiana, Peteris Krisjanis, - Roy-Magne Mo, Stanislav Visnovsky, Takayuki Kusano] - * Misc fixes [Glynn] - -gnome-core/misc - - * Build fixes [Glynn] - -gnome-core/gnome-terminal - - * Misc fixes [Owen] - * Build fixes [Darin] - * Typographical error [Kjartan] - -============= -Version 1.5.4 -============= - -* Panel: - + lots of gconf work - + Session handling proposal (Alex, Glynn, George, others?) - + profiles (Glynn) - + default panels/applets (Glynn) - + panels saving/loading (Glynn) - + applets/menus etc. saving/loading (Mark) - + convience methods (Glynn, Mark) - + kill gnome-run button applet (Glynn) - + libart -> gdk-pixbuf for button rendering (Alex) - + porting properties capplet (Stephen) - + new ditem api usage (George) - + launchers/vfolders work (George, Seth) - + kill favorites menu (George) - + use gtk image menu items (George) - + port to libwnck (George) - + menu fixage (Anders) - + removal of deprecated function/widgets (George) - + Menu work (George) - + winhints updates (George, Havoc, Alex, Mark) - + foobar pixmap scaling (Chris Phelps) - + foobar clock nicifying (Dennis M. Cranston, George) - + cruft removal (Mark, George, Glynn) - + CORBA namespace fixage (Mark) - + make applet background colors 16 bit (Alex) - + dialog box fixage (Gediminas Paulauskas) - + panel side use of applet item handler (Mark) - + solaris distribution menu (Stephen) - + screen shooter updates (Anders) - + applet stabilty fixes (Anders) - + gegl invaders ... *cough* (George) - + panel-widget and button-widget cleanup (Alex) - + hidebutton keyborad navigation (Padraig O'Briain) - + applet pixmap background implemenation (Mark) - + gtk accelerator parsing updates (Alex) - -* Panel Applet Library - - + shlib applet macro (Mark) - + move to GNOME_Vertigo CORBA namespace (Mark) - + kill session management (Mark) - + make applet background colors 16 bit (Alex) - + item handler implementation (Mark) - + runtime schema<->key association for applets prefs (Mark) - + gconf convienence functions (Mark) - + gclosurization (George) - + removal of gnome_program_init (George) - + applet pixmap bacgrounds (Mark) - + expose panel_applet_gconf_get_full_key (Alex) - -* Applets - - + update for panel-applet api changes (Mark) - + fish preferences/schema/gconf work (Mark) - + clock utf-8 fixage (Richard Hult) - + clock + tasklist background (Alex) - + mailcheck port (Kevin Valdersloot) - + tasklist + pager properties/gconf work (Alex) - -* Build: - + intl dir removal (Gediminas Paulauskas) - + libwnck dependancy (George, Glynn) - + libpng check (Anders, Glynn) - + file renaming (Mark) - + clean up Glynn's drool (Darin) - + kill -I$(includedir) (Frank Belew) - -* Icons - + time/date icons (Dennis M. Cranston) - + hand removal from panel icon (Seth) - -* ditem library - - + standard compliance (George) - + new api (George) - + i18n fixage (Gediminas Paulauskas) - + kde icons (George) - + g_spawn fixage (George, Glynn) - + distcheck fixes (Mark, Glynn) - -* Misc - + gnome-terminal fixage (Owen) - + .directory files work (Seth) - + gsm gconf work (Richard Hestilow) - -* Other Contributors - - + Miles Lane, Robert Mibus. - -============= -Version 1.5.3 -============= - -gnome-core/applets - - + New tasklist using libwnck [Alex] - + Updates for new API [Mark] - + Build fixes [Mark] - -gnome-core/gnome-desktop - - + GnomeVFS fixes [Alex] - + Add pc file [Owen] - + Encoding fix [Seth] - -gnome-core/gsm - - + Prefer Metacity to Enlightenment [Havoc] - + Save world yet again with .gnome2 fixes [Malcolm] - + Fix order of initialization [Malcolm] - + Use PangoFontDesc with splash screen [Glynn] - -gnome-core/panel - - + Add getExpandFlags method to IDL [Alex] - + Add saveYourself method to IDL [Mark] - + Remove/Replaced all AppletShell IDL methods [Mark] - -============= -Version 1.5.2 -============= - - + new pager applet using libwnck (Alex) - + .desktop file updates and additions (Seth) - + gnome-hint is now a GtkDialog (Anders) - + session manager gtk fixes (Owen) - + gtk_idle_add -> g_idle_add stackframes saving (Mark) - + applet button press propogation bug fix (Alex) - + continue switching to new applet design (Mark) - + schema file rename (Glynn) - + POTFILES redo (Mark) - -============= -Version 1.5.1 -============= - - Initial port to GNOME 2.0. +================ +Version 3.18.1.2 +================ + * Fix builds that don't have --prefix passed to configure diff -Nru gnome-session-3.16.0/po/fa.po gnome-session-3.18.1.2/po/fa.po --- gnome-session-3.16.0/po/fa.po 2014-12-05 19:58:27.000000000 +0000 +++ gnome-session-3.18.1.2/po/fa.po 2015-09-16 17:18:35.000000000 +0000 @@ -6,15 +6,16 @@ # Elnaz Sarbar , 2005, 2006. # Meelad Zakaria , 2006. # Mahyar Moghimi , 2010. -# Arash Mousavi , 2011, 2012, 2013. +# Arash Mousavi , 2011, 2012, 2013, 2015. # Danial Behzadi , 2013. # msgid "" msgstr "" "Project-Id-Version: gnome-session 2.10.0\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-09-09 23:10+0000\n" -"PO-Revision-Date: 2013-10-05 18:08+0330\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-09-10 20:08+0000\n" +"PO-Revision-Date: 2015-09-11 19:28+0430\n" "Last-Translator: Arash Mousavi \n" "Language-Team: Persian\n" "Language: fa_IR\n" @@ -23,59 +24,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 1.5.7\n" - -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "انتخاب فرمان" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "افزودن برنامه‌ی راه‌اندازی" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "ویرایش برنامه‌ی راه‌اندازی" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "فرمان راه‌اندازی نمی‌تواند خالی باشد" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "فرمان راه‌اندازی معتبر نیست" - -#: ../capplet/gsm-properties-dialog.c:519 -msgid "Enabled" -msgstr "فعال" - -#: ../capplet/gsm-properties-dialog.c:531 -msgid "Icon" -msgstr "نقشک" - -#: ../capplet/gsm-properties-dialog.c:543 -msgid "Program" -msgstr "برنامه" - -#: ../capplet/gsm-properties-dialog.c:747 -msgid "Startup Applications Preferences" -msgstr "ترجیحات برنامه‌های راه‌اندازی" - -#: ../capplet/gsp-app.c:276 -msgid "No name" -msgstr "بدون نام" - -#: ../capplet/gsp-app.c:282 -msgid "No description" -msgstr "بدون شرح" - -#: ../capplet/main.c:35 ../gnome-session/main.c:309 -msgid "Version of this application" -msgstr "نسخه‌ی این برنامه" - -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "نمی‌توان سند راهنما را نمایش داد" +"X-Generator: Poedit 1.8.4\n" #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" @@ -97,22 +46,11 @@ msgid "GNOME dummy" msgstr "گنوم ساختگی" -#: ../data/gnome-session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "برنامه‌های راه‌اندازی" - -#: ../data/gnome-session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "انتخاب کنید که هنگام ورود به سیستم چه برنامه‌هایی آغاز شوند" - -#: ../data/gnome-wayland.desktop.in.h:1 -#: ../data/gnome-wayland.session.desktop.in.in.h:1 -#| msgid "GNOME fallback" +#: ../data/gnome-wayland.desktop.in.h:1 ../data/gnome-wayland.session.desktop.in.in.h:1 msgid "GNOME on Wayland" msgstr "گنوم بر روی Wayland" #: ../data/gnome-wayland.desktop.in.h:2 -#| msgid "This session logs you into GNOME" msgid "This session logs you into GNOME, using Wayland" msgstr "این نشست، با استفاده از Wayland شما را به گنوم وارد می‌کند" @@ -120,7 +58,7 @@ msgid "Custom Session" msgstr "نشست سفارشی" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "لطفاً یک نشست سفارشی را برای اجرا انتخاب کنید" @@ -176,87 +114,26 @@ msgid "_Name:" msgstr "_نام:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "پرونده یک پرونده‌ی .desktop معتبر نیست." - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "نسخه‌ی پرونده میزکار ناشناس «%s»" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "در حال آغاز %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "برنامه سند‌ها را در خط فرمان نمی‌پذیرد." - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "گزینه‌ی راه‌اندازی ناشناخته‌: %Id" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "نشانی سند به یک ورودی میزکار «نوع=پیوند» گذر داده نمی‌شود." - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "این، یک مورد قابل راه‌اندازی نیست" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "از کار انداختن اتصال به مدیر نشست" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "مشخص کردن پرونده‌ی شامل پیکربندی ذخیره شده" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "پرونده" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "شناسه مدیریت نشست را مشخص کنید" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "شناسه" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "گزینه‌های مدیریت نشست:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "گزینه‌های مدیریت نشست نمایش داده شوند" - -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:313 msgid "Oh no! Something has gone wrong." msgstr "اُخ نه! یک چیزی اشتباه شد." -#: ../gnome-session/gsm-fail-whale-dialog.c:302 -msgid "A problem has occurred and the system can't recover. Please contact a system administrator" -msgstr "یک مشکل رُخ داده است و سیستم نمی‌تواند بازیابی شود. لطفا با یک مدیر سیستم تماس بگیرید" - -#: ../gnome-session/gsm-fail-whale-dialog.c:304 -msgid "A problem has occurred and the system can't recover. All extensions have been disabled as a precaution." -msgstr "یک مشکل رُخ داده است و سیستم نمی‌تواند بازیابی شود. تمام افزونه‌ها جهت احتیاط غیرفعال شده‌اند." +#: ../gnome-session/gsm-fail-whale-dialog.c:320 +msgid "" +"A problem has occurred and the system can't recover. Please contact a system " +"administrator" +msgstr "" +"یک مشکل رُخ داده است و سیستم نمی‌تواند بازیابی شود. لطفا با یک مدیر سیستم تماس بگیرید" + +#: ../gnome-session/gsm-fail-whale-dialog.c:322 +msgid "" +"A problem has occurred and the system can't recover. All extensions have been disabled " +"as a precaution." +msgstr "" +"یک مشکل رُخ داده است و سیستم نمی‌تواند بازیابی شود. تمام افزونه‌ها جهت احتیاط غیرفعال " +"شده‌اند." -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:324 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -264,27 +141,27 @@ "یک مشکل رُخ داده است و سیستم نمی‌تواند بازیابی شود.\n" "لطفا از سیستم خارج شوید و دوباره امتحان کنید." -#: ../gnome-session/gsm-fail-whale-dialog.c:321 +#: ../gnome-session/gsm-fail-whale-dialog.c:339 msgid "_Log Out" msgstr "_خروج از سیستم" -#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 +#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:243 msgid "Enable debugging code" msgstr "کد اشکال‌زدایی به کار انداخته شود" -#: ../gnome-session/gsm-fail-whale-dialog.c:344 +#: ../gnome-session/gsm-fail-whale-dialog.c:362 msgid "Allow logout" msgstr "اجازه خروج از سیستم داده شود" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 +#: ../gnome-session/gsm-fail-whale-dialog.c:363 msgid "Show extension warning" msgstr "اخطار پسوند نشان داده شود" -#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 +#: ../gnome-session/gsm-manager.c:1251 ../gnome-session/gsm-manager.c:1896 msgid "Not responding" msgstr "نا پاسخگو" -#: ../gnome-session/gsm-util.c:411 +#: ../gnome-session/gsm-util.c:381 msgid "_Log out" msgstr "_خروج از سیستم" @@ -292,53 +169,61 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:559 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "بخاطر سپردن برنامه" -#: ../gnome-session/gsm-xsmp-client.c:1209 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "این برنامه جلوی خروج از سیستم را گرفته است." -#: ../gnome-session/gsm-xsmp-server.c:341 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "Refusing new client connection because the session is currently being shut down\n" msgstr "چون سیستم در حال خاموش شدن است درخواست اتصال کارگیر رَد می‌شود\n" -#: ../gnome-session/gsm-xsmp-server.c:610 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ایجاد سوکت گوش‌کننده‌ی ICE ممکن نشد: %s" -#: ../gnome-session/main.c:305 +#: ../gnome-session/main.c:241 msgid "Override standard autostart directories" msgstr "شاخه‌های استاندارد آغاز خودکار، لغو شود" -#: ../gnome-session/main.c:305 +#: ../gnome-session/main.c:241 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:306 +#: ../gnome-session/main.c:242 msgid "Session to use" msgstr "نشستی که استفاده شود" -#: ../gnome-session/main.c:306 +#: ../gnome-session/main.c:242 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:308 +#: ../gnome-session/main.c:244 msgid "Do not load user-specified applications" msgstr "برنامه‌های مشخص شده توسط کاربر اجرا نشوند" +#: ../gnome-session/main.c:245 +msgid "Version of this application" +msgstr "نسخه‌ی این برنامه" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:311 +#: ../gnome-session/main.c:247 msgid "Show the fail whale dialog for testing" msgstr "نمایش بالن محاوره شکست جهت آزمایش کردن" -#: ../gnome-session/main.c:344 +#: ../gnome-session/main.c:248 +msgid "Disable hardware acceleration check" +msgstr "غیرفعال‌سازی بررسی شتابدهنده سخت‌افزاری" + +#: ../gnome-session/main.c:267 msgid " - the GNOME session manager" msgstr " ـ مدیر نشست گنوم" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -371,67 +256,151 @@ "\n" "اگر هیچ گزینه‌ی --inhibit مشخص نشده باشد, idle درنظر گرفته می‌شود.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "اجرای %s شکست خورد\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "دستور %s احتیاج به یک آرگومان دارد\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format msgid "Session %d" msgstr "نشست %Id" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "نام نشست‌ها نمی‌توانند با «.» شروع شده یا شامل نویسه‌ی «/» باشند" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "نام نشست‌ها نمی‌توانند با «.» شروع شوند" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "نام نشست‌ها نمی‌توانند شامل نویسه‌ی «/» باشند" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "نشستی با نام «%s» از پیش وجود دارد" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:49 msgid "Log out" msgstr "خروج از سیستم" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:50 msgid "Power off" msgstr "خاموش کردن" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:51 msgid "Reboot" msgstr "راه‌اندازی مجدد" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:52 msgid "Ignoring any existing inhibitors" msgstr "هرگونه مهارکننده‌های خروج را نادیده بگیر" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:53 msgid "Don't prompt for user confirmation" msgstr "برای تصدیق هویت کاربر هشدار نده" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:87 ../tools/gnome-session-quit.c:101 msgid "Could not connect to the session manager" msgstr "اتصال به مدیر نشست ممکن نیست" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:196 msgid "Program called with conflicting options" msgstr "برنامه با گزینه‌های ناسازگار فراخوانده شده است" +#~ msgid "Select Command" +#~ msgstr "انتخاب فرمان" + +#~ msgid "Add Startup Program" +#~ msgstr "افزودن برنامه‌ی راه‌اندازی" + +#~ msgid "Edit Startup Program" +#~ msgstr "ویرایش برنامه‌ی راه‌اندازی" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "فرمان راه‌اندازی نمی‌تواند خالی باشد" + +#~ msgid "The startup command is not valid" +#~ msgstr "فرمان راه‌اندازی معتبر نیست" + +#~ msgid "Enabled" +#~ msgstr "فعال" + +#~ msgid "Icon" +#~ msgstr "نقشک" + +#~ msgid "Program" +#~ msgstr "برنامه" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "ترجیحات برنامه‌های راه‌اندازی" + +#~ msgid "No name" +#~ msgstr "بدون نام" + +#~ msgid "No description" +#~ msgstr "بدون شرح" + +#~ msgid "Could not display help document" +#~ msgstr "نمی‌توان سند راهنما را نمایش داد" + +#~ msgid "Startup Applications" +#~ msgstr "برنامه‌های راه‌اندازی" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "انتخاب کنید که هنگام ورود به سیستم چه برنامه‌هایی آغاز شوند" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "پرونده یک پرونده‌ی .desktop معتبر نیست." + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "نسخه‌ی پرونده میزکار ناشناس «%s»" + +#~ msgid "Starting %s" +#~ msgstr "در حال آغاز %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "برنامه سند‌ها را در خط فرمان نمی‌پذیرد." + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "گزینه‌ی راه‌اندازی ناشناخته‌: %Id" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "نشانی سند به یک ورودی میزکار «نوع=پیوند» گذر داده نمی‌شود." + +#~ msgid "Not a launchable item" +#~ msgstr "این، یک مورد قابل راه‌اندازی نیست" + +#~ msgid "Disable connection to session manager" +#~ msgstr "از کار انداختن اتصال به مدیر نشست" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "مشخص کردن پرونده‌ی شامل پیکربندی ذخیره شده" + +#~ msgid "FILE" +#~ msgstr "پرونده" + +#~ msgid "Specify session management ID" +#~ msgstr "شناسه مدیریت نشست را مشخص کنید" + +#~ msgid "ID" +#~ msgstr "شناسه" + +#~ msgid "Session management options:" +#~ msgstr "گزینه‌های مدیریت نشست:" + +#~ msgid "Show session management options" +#~ msgstr "گزینه‌های مدیریت نشست نمایش داده شوند" + #~ msgid "Some programs are still running:" #~ msgstr "چند برنامه همچنان در حال اجرا هستند:" @@ -440,26 +409,26 @@ #~ msgid "A program is still running:" #~ msgstr "یک برنامه همچنان در حال اجرا است:" -#~| msgid "" -#~| "Waiting for the program to finish. Interrupting the program may cause " -#~| "you to lose work." +#~| msgid "" +#~| "Waiting for the program to finish. Interrupting the program may cause you to lose " +#~| "work." #~ msgid "" -#~ "Waiting for the program to finish. Interrupting the program may cause you " -#~ "to lose work." +#~ "Waiting for the program to finish. Interrupting the program may cause you to lose " +#~ "work." #~ msgstr "" -#~ "در حال انتظار برای پایان یافتن برنامه. وقفه انداختن در برنامه ممکن است " -#~ "باعث از دست رفتن کارتان بشود." -#~| msgid "" -#~| "Waiting for programs to finish. Interrupting these programs may cause " -#~| "you to lose work." +#~ "در حال انتظار برای پایان یافتن برنامه. وقفه انداختن در برنامه ممکن است باعث از دست " +#~ "رفتن کارتان بشود." +#~| msgid "" +#~| "Waiting for programs to finish. Interrupting these programs may cause you to lose " +#~| "work." #~ msgid "" -#~ "Waiting for programs to finish. Interrupting these programs may cause you " -#~ "to lose work." +#~ "Waiting for programs to finish. Interrupting these programs may cause you to lose " +#~ "work." #~ msgstr "" -#~ "در حال انتظار برای پایان یافتن برنامه‌ها. وقفه انداختن در این برنامه‌ها " -#~ "ممکن است باعث از دست رفتن کارتان بشود." +#~ "در حال انتظار برای پایان یافتن برنامه‌ها. وقفه انداختن در این برنامه‌ها ممکن است باعث " +#~ "از دست رفتن کارتان بشود." #~ msgid "Switch User Anyway" #~ msgstr "در هر حال، تعویض کاربر انجام شود" @@ -486,24 +455,19 @@ #~ msgstr "انصراف" #~ msgid "You will be automatically logged out in %d second." - #~ msgid_plural "You will be automatically logged out in %d seconds." #~ msgstr[0] "شما پس از %Id ثانیه به صورت خودکار از سیستم خارج خواهید شد." #~ msgstr[1] "شما پس از %Id ثانیه خودکار از سیستم خارج خواهید شد." #~ msgid "This system will be automatically shut down in %d second." - #~ msgid_plural "This system will be automatically shut down in %d seconds." #~ msgstr[0] "این سیستم پس از %Id ثانیه، به صورت خودکار خاموش خواهد شد." #~ msgstr[1] "این سیستم پس از %Id ثانیه، خودکار خاموش خواهد شد." #~ msgid "This system will be automatically restarted in %d second." - #~ msgid_plural "This system will be automatically restarted in %d seconds." -#~ msgstr[0] "" -#~ "این سیستم پس از %Id ثانیه، به صورت خودکار مجددا راه‌اندازی خواهد شد." -#~ msgstr[1] "" -#~ "این سیستم پس از %Id ثانیه، بصورت خودکار مجددا راه‌اندازی خواهد شد." +#~ msgstr[0] "این سیستم پس از %Id ثانیه، به صورت خودکار مجددا راه‌اندازی خواهد شد." +#~ msgstr[1] "این سیستم پس از %Id ثانیه، بصورت خودکار مجددا راه‌اندازی خواهد شد." #~ msgid "You are currently logged in as \"%s\"." #~ msgstr "هم‌اکنون شما با عنوان «%s» وارد سیستم شده‌اید." @@ -533,19 +497,16 @@ #~ msgstr "سیستم هم‌اکنون خاموش شود؟" #~ msgid "%d hour" - #~ msgid_plural "%d hours" #~ msgstr[0] "%Id ساعت" #~ msgstr[1] "%Id ساعت" #~ msgid "%d minute" - #~ msgid_plural "%d minutes" #~ msgstr[0] "%Id دقیقه" #~ msgstr[1] "%Id دقیقه" #~ msgid "%d second" - #~ msgid_plural "%d seconds" #~ msgstr[0] "%Id ثانیه" #~ msgstr[1] "%Id ثانیه" @@ -557,11 +518,10 @@ #~ msgstr "خروج خودکار از سیستم در %s" #~ msgid "" -#~ "This session is configured to automatically log out after a period of " -#~ "inactivity." +#~ "This session is configured to automatically log out after a period of inactivity." #~ msgstr "" -#~ "این نشست به‌گونه‌ای پیکربندی شده است که پس از مدتی بدون فعالبت، به طور " -#~ "خودکار از سیستم خارج شود." +#~ "این نشست به‌گونه‌ای پیکربندی شده است که پس از مدتی بدون فعالبت، به طور خودکار از سیستم " +#~ "خارج شود." #~ msgid "Icon '%s' not found" #~ msgstr "نقشک «%s» پیدا نشد" @@ -570,25 +530,22 @@ #~ msgstr "بارگیری گنوم ۳ شکست خورد" #~ msgid "" -#~ "Unfortunately GNOME 3 failed to start properly and started in the " -#~ "fallback mode.\n" +#~ "Unfortunately GNOME 3 failed to start properly and started in the fallback mode.\n" #~ "\n" -#~ "This most likely means your system (graphics hardware or driver) is not " -#~ "capable of delivering the full GNOME 3 experience." +#~ "This most likely means your system (graphics hardware or driver) is not capable of " +#~ "delivering the full GNOME 3 experience." #~ msgstr "" -#~ "متاسفانه اجرای صحیح گنوم ۳ با مشکل مواجه شد و در حالت یدکی اجرا " -#~ "شد.\n" +#~ "متاسفانه اجرای صحیح گنوم ۳ با مشکل مواجه شد و در حالت یدکی اجرا شد.\n" #~ "\n" -#~ "این موضوع اکثرا به این علت است که سیستم شما (سخت‌افزار گرافیکی یا " -#~ "راه‌انداز) قابلیت ارائه‌ی کامل گنوم ۳ را ندارد." +#~ "این موضوع اکثرا به این علت است که سیستم شما (سخت‌افزار گرافیکی یا راه‌انداز) قابلیت " +#~ "ارائه‌ی کامل گنوم ۳ را ندارد." #~ msgid "Learn more about GNOME 3" #~ msgstr "اطلاعات بیشتر در مورد گنوم ۳" -#~ msgid "" -#~ "Unable to start login session (and unable to connect to the X server)" -#~ msgstr "" -#~ "ناتوان در آغاز نشست ورود به سیستم (و ناتوان در اتصال به کارگزار ایکس)" +#~ msgid "Unable to start login session (and unable to connect to the X server)" +#~ msgstr "ناتوان در آغاز نشست ورود به سیستم (و ناتوان در اتصال به کارگزار ایکس)" #~ msgid "Some programs are still running:" #~ msgstr "هنوز برنامه‌هایی دارند اجرا می‌شوند:" diff -Nru gnome-session-3.16.0/po/fi.po gnome-session-3.18.1.2/po/fi.po --- gnome-session-3.16.0/po/fi.po 2015-03-17 18:13:33.000000000 +0000 +++ gnome-session-3.18.1.2/po/fi.po 2015-10-14 13:43:38.000000000 +0000 @@ -15,8 +15,8 @@ "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-02 20:46+0000\n" -"PO-Revision-Date: 2015-03-02 23:03+0200\n" +"POT-Creation-Date: 2015-10-05 08:30+0000\n" +"PO-Revision-Date: 2015-10-05 20:02+0300\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: suomi \n" "Language: fi\n" @@ -145,7 +145,7 @@ #: ../gnome-session/gsm-fail-whale-dialog.c:339 msgid "_Log Out" -msgstr "Kirjaudu _ulos" +msgstr "Kirjaudu ul_os" #: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:243 msgid "Enable debugging code" @@ -163,7 +163,7 @@ msgid "Not responding" msgstr "Ei vastaa" -#: ../gnome-session/gsm-util.c:381 +#: ../gnome-session/gsm-util.c:383 msgid "_Log out" msgstr "Kirjau_du ulos" diff -Nru gnome-session-3.16.0/po/fur.po gnome-session-3.18.1.2/po/fur.po --- gnome-session-3.16.0/po/fur.po 2015-02-18 19:14:08.000000000 +0000 +++ gnome-session-3.18.1.2/po/fur.po 2015-09-16 17:18:35.000000000 +0000 @@ -7,8 +7,8 @@ "Project-Id-Version: gnome-session 2.20.x\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-01-20 20:23+0000\n" -"PO-Revision-Date: 2015-01-20 22:33+0100\n" +"POT-Creation-Date: 2015-07-05 08:05+0000\n" +"PO-Revision-Date: 2015-07-05 14:50+0100\n" "Last-Translator: Fabio Tomat \n" "Language-Team: Friulian \n" "Language: fur\n" @@ -16,11 +16,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.1\n" #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" -msgstr "" +msgstr "Personalizade" #: ../data/gnome-custom-session.desktop.in.h:2 msgid "This entry lets you select a saved session" @@ -35,7 +35,6 @@ msgstr "Cheste session ti fasarâ jentrâ dentri GNOME" #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME dummy" @@ -93,7 +92,6 @@ msgstr "Opzions di session" #: ../data/session-properties.ui.h:6 -#| msgid "_Browse..." msgid "Browse…" msgstr "Esplore..." @@ -153,7 +151,7 @@ msgid "Show extension warning" msgstr "Mostre avîs di estension" -#: ../gnome-session/gsm-manager.c:1246 ../gnome-session/gsm-manager.c:1891 +#: ../gnome-session/gsm-manager.c:1251 ../gnome-session/gsm-manager.c:1896 msgid "Not responding" msgstr "Nol rispuint" @@ -166,7 +164,6 @@ #. * properties. But it could still be that SmProgram is not set. #. #: ../gnome-session/gsm-xsmp-client.c:557 -#| msgid "Remember running applications" msgid "Remembered Application" msgstr "Aplicazion memorizade " @@ -213,7 +210,7 @@ #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong #: ../gnome-session/main.c:247 msgid "Show the fail whale dialog for testing" -msgstr "" +msgstr "Mostre il dialic \"fail whale\" par fâ un test" #: ../gnome-session/main.c:248 msgid "Disable hardware acceleration check" diff -Nru gnome-session-3.16.0/po/ja.po gnome-session-3.18.1.2/po/ja.po --- gnome-session-3.16.0/po/ja.po 2014-12-05 19:58:27.000000000 +0000 +++ gnome-session-3.18.1.2/po/ja.po 2015-09-16 17:18:35.000000000 +0000 @@ -14,14 +14,15 @@ # Jiro Matsuzawa , 2011, 2012, 2013. # Hideki Yamane , 2011, 2012. # Noriko Mizumoto , 2012. +# Hajime Taira , 2015. # msgid "" msgstr "" "Project-Id-Version: gnome-session master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-09-09 23:10+0000\n" -"PO-Revision-Date: 2013-09-15 21:58+0900\n" -"Last-Translator: Jiro Matsuzawa \n" +"POT-Creation-Date: 2015-03-24 20:40+0000\n" +"PO-Revision-Date: 2015-03-25 10:53+0900\n" +"Last-Translator: Hajime Taira \n" "Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -29,58 +30,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "コマンドの選択" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "自動起動するプログラムの追加" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "自動起動するプログラムの編集" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "自動起動するプログラムのコマンド名を入力してください" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "コマンド名が間違っています" - -#: ../capplet/gsm-properties-dialog.c:519 -msgid "Enabled" -msgstr "有効" - -#: ../capplet/gsm-properties-dialog.c:531 -msgid "Icon" -msgstr "アイコン" - -#: ../capplet/gsm-properties-dialog.c:543 -msgid "Program" -msgstr "プログラム" - -#: ../capplet/gsm-properties-dialog.c:747 -msgid "Startup Applications Preferences" -msgstr "自動起動するアプリケーションの設定" - -#: ../capplet/gsp-app.c:276 -msgid "No name" -msgstr "名前なし" - -#: ../capplet/gsp-app.c:282 -msgid "No description" -msgstr "(説明なし)" - -#: ../capplet/main.c:35 ../gnome-session/main.c:309 -msgid "Version of this application" -msgstr "このアプリケーションのバージョンを表示する" - -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "ヘルプのドキュメントを表示できませんでした" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "カスタム" @@ -101,14 +50,6 @@ msgid "GNOME dummy" msgstr "GNOME ダミー" -#: ../data/gnome-session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "自動起動するアプリケーション" - -#: ../data/gnome-session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "ログインした後に起動するアプリケーションを選択します" - #: ../data/gnome-wayland.desktop.in.h:1 #: ../data/gnome-wayland.session.desktop.in.in.h:1 msgid "GNOME on Wayland" @@ -122,7 +63,7 @@ msgid "Custom Session" msgstr "カスタムセッション" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "起動するカスタムセッションを選択してください" @@ -178,87 +119,19 @@ msgid "_Name:" msgstr "名前(_N):" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "有効な .desktop ファイルではありません" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "バージョン '%s' の .desktop ファイルはサポートしていません" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%sの起動中です" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "コマンドラインからドキュメントにはアクセスできません" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "不明な起動オプションです: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "ドキュメントの URI を 'Type=Link' な .desktop エントリには渡せません" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "起動可能なアイテムではありません" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "セッションマネージャーに接続しない" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "設定を保存したファイルを指定する" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FILE" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "セッション管理の ID を指定する" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "セッション管理のオプション:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "セッション管理のオプションを表示する" - -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:313 msgid "Oh no! Something has gone wrong." msgstr "あれっ! 何かおかしいです。" -#: ../gnome-session/gsm-fail-whale-dialog.c:302 +#: ../gnome-session/gsm-fail-whale-dialog.c:320 msgid "A problem has occurred and the system can't recover. Please contact a system administrator" msgstr "問題が発生して、システムの復帰ができません。システム管理者に連絡してください" -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:322 msgid "A problem has occurred and the system can't recover. All extensions have been disabled as a precaution." msgstr "問題が発生して、システムの復帰ができません。念のため、すべての拡張を無効にしました。" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:324 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -266,27 +139,27 @@ "問題が発生して、システムの復帰ができません。\n" "ログアウトして再度試してください。" -#: ../gnome-session/gsm-fail-whale-dialog.c:321 +#: ../gnome-session/gsm-fail-whale-dialog.c:339 msgid "_Log Out" msgstr "ログアウト(_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 +#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:243 msgid "Enable debugging code" msgstr "デバッグモードにする" -#: ../gnome-session/gsm-fail-whale-dialog.c:344 +#: ../gnome-session/gsm-fail-whale-dialog.c:362 msgid "Allow logout" msgstr "ログアウトを許可する" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 +#: ../gnome-session/gsm-fail-whale-dialog.c:363 msgid "Show extension warning" msgstr "拡張機能に関する警告を表示する" -#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 +#: ../gnome-session/gsm-manager.c:1251 ../gnome-session/gsm-manager.c:1896 msgid "Not responding" msgstr "応答なし" -#: ../gnome-session/gsm-util.c:411 +#: ../gnome-session/gsm-util.c:381 msgid "_Log out" msgstr "ログアウト(_L)" @@ -294,53 +167,61 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:559 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "実行していたアプリケーション" -#: ../gnome-session/gsm-xsmp-client.c:1209 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "このプログラムがログアウトできないようにしています。" -#: ../gnome-session/gsm-xsmp-server.c:341 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "Refusing new client connection because the session is currently being shut down\n" msgstr "セッションがシャットダウンを実行しているため、新しいクライアントとの接続を拒否しました。\n" -#: ../gnome-session/gsm-xsmp-server.c:610 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE の監視ソケットを生成できませんでした: %s" -#: ../gnome-session/main.c:305 +#: ../gnome-session/main.c:241 msgid "Override standard autostart directories" msgstr "標準の自動起動フォルダーをオーバーライドする" -#: ../gnome-session/main.c:305 +#: ../gnome-session/main.c:241 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:306 +#: ../gnome-session/main.c:242 msgid "Session to use" msgstr "使用するセッション" -#: ../gnome-session/main.c:306 +#: ../gnome-session/main.c:242 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:308 +#: ../gnome-session/main.c:244 msgid "Do not load user-specified applications" msgstr "ユーザーが指定したアプリケーションを起動しない" +#: ../gnome-session/main.c:245 +msgid "Version of this application" +msgstr "このアプリケーションのバージョンを表示する" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:311 +#: ../gnome-session/main.c:247 msgid "Show the fail whale dialog for testing" msgstr "テスト用にエラー画面を表示する" -#: ../gnome-session/main.c:344 +#: ../gnome-session/main.c:248 +msgid "Disable hardware acceleration check" +msgstr "ハードウェアアクセラレーションのチェックを無効化する" + +#: ../gnome-session/main.c:267 msgid " - the GNOME session manager" msgstr "- GNOME セッションマネージャー" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -372,67 +253,151 @@ "\n" "--inhibit オプションが無指定の場合 idle を指定したものと扱います。\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "%s を起動できませんでした。\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s には引数が1つ必要です。\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format msgid "Session %d" msgstr "セッション %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "セッション名は‘.’から始めたり、‘/’を含めることはできません。" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "‘.’はセッション名の先頭には使用できません。" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "‘/’はセッション名に含めることができません。" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "セッション‘%s’は既に存在します。" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:49 msgid "Log out" msgstr "ログアウトする" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:50 msgid "Power off" msgstr "電源オフ" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:51 msgid "Reboot" msgstr "再起動" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:52 msgid "Ignoring any existing inhibitors" msgstr "阻害するプロセスを無視する" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:53 msgid "Don't prompt for user confirmation" msgstr "ユーザーに確認をしない" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:87 ../tools/gnome-session-quit.c:101 msgid "Could not connect to the session manager" msgstr "セッションマネージャーに接続できませんでした" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:196 msgid "Program called with conflicting options" msgstr "同時には適用できないオプションを指定しました" +#~ msgid "Select Command" +#~ msgstr "コマンドの選択" + +#~ msgid "Add Startup Program" +#~ msgstr "自動起動するプログラムの追加" + +#~ msgid "Edit Startup Program" +#~ msgstr "自動起動するプログラムの編集" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "自動起動するプログラムのコマンド名を入力してください" + +#~ msgid "The startup command is not valid" +#~ msgstr "コマンド名が間違っています" + +#~ msgid "Enabled" +#~ msgstr "有効" + +#~ msgid "Icon" +#~ msgstr "アイコン" + +#~ msgid "Program" +#~ msgstr "プログラム" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "自動起動するアプリケーションの設定" + +#~ msgid "No name" +#~ msgstr "名前なし" + +#~ msgid "No description" +#~ msgstr "(説明なし)" + +#~ msgid "Could not display help document" +#~ msgstr "ヘルプのドキュメントを表示できませんでした" + +#~ msgid "Startup Applications" +#~ msgstr "自動起動するアプリケーション" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "ログインした後に起動するアプリケーションを選択します" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "有効な .desktop ファイルではありません" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "バージョン '%s' の .desktop ファイルはサポートしていません" + +#~ msgid "Starting %s" +#~ msgstr "%sの起動中です" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "コマンドラインからドキュメントにはアクセスできません" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "不明な起動オプションです: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "ドキュメントの URI を 'Type=Link' な .desktop エントリには渡せません" + +#~ msgid "Not a launchable item" +#~ msgstr "起動可能なアイテムではありません" + +#~ msgid "Disable connection to session manager" +#~ msgstr "セッションマネージャーに接続しない" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "設定を保存したファイルを指定する" + +#~ msgid "FILE" +#~ msgstr "FILE" + +#~ msgid "Specify session management ID" +#~ msgstr "セッション管理の ID を指定する" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "セッション管理のオプション:" + +#~ msgid "Show session management options" +#~ msgstr "セッション管理のオプションを表示する" + #~ msgid "Some programs are still running:" #~ msgstr "いくつかのプログラムが未だ実行中です:" diff -Nru gnome-session-3.16.0/po/nl.po gnome-session-3.18.1.2/po/nl.po --- gnome-session-3.16.0/po/nl.po 2014-12-05 19:58:27.000000000 +0000 +++ gnome-session-3.18.1.2/po/nl.po 2015-09-16 17:18:35.000000000 +0000 @@ -4,6 +4,10 @@ # # Copyright (C) 1998 Free Software Foundation, Inc. # +# +# Fail whale - misvis (hahaha, een hele flauwe grap van Wouter) +# Fail whale - misschien Zwarte dialoogvenster? Minder grappig. (Hannie) +# # Dirk-Jan C. Binnema , 1998, 1999. # Dennis Smit , 2000. # Almer S. Tigelaar , 2000. @@ -11,78 +15,26 @@ # Huib Kleinhout , 2002. # Ronald Hummelink , 2002. # Jeroen van der Vegt , 2002. -# Reinout van Schouwen , 2003, 2013. (na 10 jaar!) +# Reinout van Schouwen , 2003, 2013. (na 10 jaar!). # Tino Meinen 2005, 2006, 2008. # Wouter Bolsterlee , 2007–2013. -# -# Fail whale - misvis (hahaha, een hele flauwe grap van Wouter) -# +# Nathan Follens , 2015. +# Hannie Dumoleyn , 2015. msgid "" msgstr "" "Project-Id-Version: gnome-session\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-22 00:08+0200\n" -"PO-Revision-Date: 2013-09-22 00:10+0100\n" -"Last-Translator: Reinout van Schouwen \n" -"Language-Team: Dutch \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-04-02 19:48+0000\n" +"PO-Revision-Date: 2015-08-24 17:52+0200\n" +"Last-Translator: Hannie Dumoleyn \n" +"Language-Team: Dutch \n" "Language: nl\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" -"X-Generator: Lokalize 1.1\n" - -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "Opdracht selecteren" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "Te starten programma toevoegen" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "Te starten programma bewerken" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "De opstartopdracht mag niet leeg zijn" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "De opstartopdracht is ongeldig" - -#: ../capplet/gsm-properties-dialog.c:519 -msgid "Enabled" -msgstr "Ingeschakeld" - -#: ../capplet/gsm-properties-dialog.c:531 -msgid "Icon" -msgstr "Pictogram" - -#: ../capplet/gsm-properties-dialog.c:543 -msgid "Program" -msgstr "Programma" - -#: ../capplet/gsm-properties-dialog.c:747 -msgid "Startup Applications Preferences" -msgstr "Voorkeuren opstarttoepassingen" - -#: ../capplet/gsp-app.c:276 -msgid "No name" -msgstr "Naamloos" - -#: ../capplet/gsp-app.c:282 -msgid "No description" -msgstr "Geen beschrijving" - -#: ../capplet/main.c:35 ../gnome-session/main.c:309 -msgid "Version of this application" -msgstr "Versie van deze toepassing" - -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "Kon hulpdocument niet weergeven" +"X-Generator: Lokalize 1.5\n" #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" @@ -104,14 +56,6 @@ msgid "GNOME dummy" msgstr "Gnome dummy" -#: ../data/gnome-session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Opstarttoepassingen" - -#: ../data/gnome-session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Toepassingen kiezen die bij aanmelden opgestart worden" - #: ../data/gnome-wayland.desktop.in.h:1 #: ../data/gnome-wayland.session.desktop.in.in.h:1 msgid "GNOME on Wayland" @@ -125,7 +69,7 @@ msgid "Custom Session" msgstr "Aangepaste sessie" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "Selecteer de te starten aangepaste sessie" @@ -155,7 +99,7 @@ #: ../data/session-properties.ui.h:3 msgid "_Automatically remember running applications when logging out" -msgstr "_Automatisch actieve toepassing onthouden bij uitloggen" +msgstr "_Automatisch actieve toepassing onthouden bij afmelden" # Actieve toepassingen _onthouden #: ../data/session-properties.ui.h:4 @@ -182,85 +126,11 @@ msgid "_Name:" msgstr "_Naam:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Bestand is geen geldig ‘.desktop’ bestand" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Niet herkende versie desktopbestand ‘%s’" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%s starten" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Toepassing accepteert geen documenten op de opdrachtregel" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Niet herkende uitvoeringsoptie: %d" - -# wat een technotaal zeg. -# vrij vertaald: -# Documenten kunnen niet naar een snelkoppelingspictogram op het -# bureaublad verleept worden. -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"Kan document-URI's niet doorgeven aan een desktop-entry met ‘Type=Link’" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "Niet uitvoerbaar item" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "Verbinding met het sessiebeheer verbreken" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "Geef het bestand met de opgeslagen configuratie" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "BESTAND" - -# Het id-nummer van de sessie die geladen moet worden -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "Geef het ID-nummer van het sessiebeheer" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "Sessiebeheeropties:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "Sessiebeheeropties tonen" - -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:313 msgid "Oh no! Something has gone wrong." msgstr "Oeps! Er is iets misgegaan." -#: ../gnome-session/gsm-fail-whale-dialog.c:302 +#: ../gnome-session/gsm-fail-whale-dialog.c:320 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -268,43 +138,44 @@ "Er is een probleem opgetreden dat het systeem niet kan herstellen. Neem " "contact op met een systeembeheerder." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:322 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." msgstr "" -"Er is een probleem opgetreden dat het systeem niet kan herstellen. Alle " +"Er is een probleem opgetreden dat niet door het systeem kan worden hersteld. " +"Alle " "uitbreidingen zijn uit voorzorg uitgeschakeld." -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:324 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." msgstr "" -"Er is een probleem opgetreden dat het systeem niet kan herstellen.\n" +"Er is een probleem opgetreden dat niet door het systeem kan worden hersteld.\n" "Probeer af te melden en opnieuw aan te melden." -#: ../gnome-session/gsm-fail-whale-dialog.c:321 +#: ../gnome-session/gsm-fail-whale-dialog.c:339 msgid "_Log Out" msgstr "_Afmelden" -#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 +#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:243 msgid "Enable debugging code" msgstr "Debugging-code inschakelen" -#: ../gnome-session/gsm-fail-whale-dialog.c:344 +#: ../gnome-session/gsm-fail-whale-dialog.c:362 msgid "Allow logout" msgstr "Afmelden toestaan" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 +#: ../gnome-session/gsm-fail-whale-dialog.c:363 msgid "Show extension warning" msgstr "Waarschuwingen van uitbreidingen tonen" -#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 +#: ../gnome-session/gsm-manager.c:1251 ../gnome-session/gsm-manager.c:1896 msgid "Not responding" msgstr "Reageert niet" -#: ../gnome-session/gsm-util.c:411 +#: ../gnome-session/gsm-util.c:381 msgid "_Log out" msgstr "_Afmelden" @@ -313,16 +184,16 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:559 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "Onthouden toepassingen" -#: ../gnome-session/gsm-xsmp-client.c:1209 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "Deze toepassing verhindert het afmelden." # client-verbinding/verbinding/ -#: ../gnome-session/gsm-xsmp-server.c:341 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" @@ -330,41 +201,49 @@ "Nieuwe verbinding wordt geweigerd omdat de sessie momenteel wordt " "afgesloten\n" -#: ../gnome-session/gsm-xsmp-server.c:610 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "Kon geen luister-socket voor ICE aanmaken: %s" -#: ../gnome-session/main.c:305 +#: ../gnome-session/main.c:241 msgid "Override standard autostart directories" msgstr "Map voor automatisch te starten toepassingen" -#: ../gnome-session/main.c:305 +#: ../gnome-session/main.c:241 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_MAP" -#: ../gnome-session/main.c:306 +#: ../gnome-session/main.c:242 msgid "Session to use" msgstr "Te gebruiken sessie" -#: ../gnome-session/main.c:306 +#: ../gnome-session/main.c:242 msgid "SESSION_NAME" msgstr "NAAM_VAN_SESSIE" -#: ../gnome-session/main.c:308 +#: ../gnome-session/main.c:244 msgid "Do not load user-specified applications" -msgstr "Geen toepassingen laden die door de gebruiker opgegeven zijn" +msgstr "Toepassingen die door de gebruiker opgegeven zijn niet laden" + +#: ../gnome-session/main.c:245 +msgid "Version of this application" +msgstr "Versie van deze toepassing" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:311 +#: ../gnome-session/main.c:247 msgid "Show the fail whale dialog for testing" msgstr "Het misvis-venster tonen voor testen" -#: ../gnome-session/main.c:344 +#: ../gnome-session/main.c:248 +msgid "Disable hardware acceleration check" +msgstr "Hardwareversnellingscontrole uitschakelen" + +#: ../gnome-session/main.c:267 msgid " - the GNOME session manager" msgstr " — het Gnome-sessiebeheer" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -388,7 +267,7 @@ "van de opgegeven opdracht.\n" " -h, --help Deze uitleg tonen\n" " --version Programmaversie tonen\n" -" --app-id ID Te gebruiken toapassings-id (optioneel)\n" +" --app-id ID Te gebruiken toepassings-id (optioneel)\n" " --reason REDEN Reden voor voor uitschakelen sessiefuncties (optioneel)\n" " --inhibit ARG Uit te schakelen functionaliteit; dit is een met " "dubbele\n" @@ -398,185 +277,121 @@ "\n" "Als ‘--inhibit’ niet opgegeven wordt, wordt alleen ‘idle’ gebruikt.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "Fout bij uitvoeren van %s\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s heeft een argumentwaarde nodig\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format msgid "Session %d" msgstr "Sessie %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "Sessienamen mogen niet met een ‘.’ beginnen of ‘/’ bevatten." -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "Sessienamen mogen niet met een ‘.’ beginnen." -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "Sessienamen mogen geen ‘/’ bevatten." -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "Er bestaat reeds een sessie genaamd ‘%s’." -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:49 msgid "Log out" msgstr "Afmelden" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:50 msgid "Power off" msgstr "Computer uitzetten" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:51 msgid "Reboot" msgstr "Opnieuw opstarten" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:52 msgid "Ignoring any existing inhibitors" msgstr "Actieve verhindering door toepassingen negeren" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:53 msgid "Don't prompt for user confirmation" msgstr "Geen bevestiging van gebruiker vragen" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:87 ../tools/gnome-session-quit.c:101 msgid "Could not connect to the session manager" msgstr "Kan geen verbinding maken met het sessiebeheer" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:196 msgid "Program called with conflicting options" msgstr "Toepassing aangeroepen met conflicterende opties" -#~ msgid "Some programs are still running:" -#~ msgstr "Er zijn nog toepassingen actief:" +#~ msgid "Select Command" +#~ msgstr "Opdracht selecteren" + +#~ msgid "Add Startup Program" +#~ msgstr "Te starten programma toevoegen" + +#~ msgid "Edit Startup Program" +#~ msgstr "Te starten programma bewerken" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "De opstartopdracht mag niet leeg zijn" + +#~ msgid "The startup command is not valid" +#~ msgstr "De opstartopdracht is ongeldig" + +#~ msgid "Enabled" +#~ msgstr "Ingeschakeld" + +#~ msgid "Icon" +#~ msgstr "Pictogram" + +#~ msgid "Program" +#~ msgstr "Programma" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "Voorkeuren opstarttoepassingen" + +#~ msgid "No name" +#~ msgstr "Naamloos" + +#~ msgid "No description" +#~ msgstr "Geen beschrijving" + +#~ msgid "Could not display help document" +#~ msgstr "Kon hulpdocument niet weergeven" + +#~ msgid "Startup Applications" +#~ msgstr "Opstarttoepassingen" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "Toepassingen kiezen die bij aanmelden opgestart worden" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "Bestand is geen geldig ‘.desktop’ bestand" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "Niet herkende versie desktopbestand ‘%s’" -#~ msgid "Unknown" -#~ msgstr "Onbekend" +#~ msgid "Starting %s" +#~ msgstr "%s starten" -#~ msgid "A program is still running:" -#~ msgstr "Er is nog een toepassing actief:" +#~ msgid "Application does not accept documents on command line" +#~ msgstr "Toepassing accepteert geen documenten op de opdrachtregel" -#~ msgid "" -#~ "Waiting for the program to finish. Interrupting the program may cause you " -#~ "to lose work." -#~ msgstr "" -#~ "Wachten totdat de toepassing geëindigd is. Het onderbreken van de " -#~ "toepassing kan er toe leiden dat er werk verloren gaat." - -#~ msgid "" -#~ "Waiting for programs to finish. Interrupting these programs may cause you " -#~ "to lose work." -#~ msgstr "" -#~ "Wachten totdat de toepassingen geëindigd zijn. Het onderbreken van " -#~ "toepassingen kan er toe leiden dat er werk verloren gaat." - -#~ msgid "Switch User Anyway" -#~ msgstr "Toch gebruiker _wisselen" - -#~ msgid "Log Out Anyway" -#~ msgstr "Toch afmelden" - -#~ msgid "Suspend Anyway" -#~ msgstr "Toch in pauzestand" - -#~ msgid "Hibernate Anyway" -#~ msgstr "Toch in _slaapstand" - -#~ msgid "Shut Down Anyway" -#~ msgstr "Toch afsluiten" - -#~ msgid "Restart Anyway" -#~ msgstr "Toch herstarten" - -#~ msgid "Lock Screen" -#~ msgstr "Beeldscherm vergrendelen" - -#~ msgid "Cancel" -#~ msgstr "Annuleren" - -#~ msgid "You will be automatically logged out in %d second." -#~ msgid_plural "You will be automatically logged out in %d seconds." -#~ msgstr[0] "Over %d seconde wordt u automatisch afgemeld." -#~ msgstr[1] "Over %d seconden wordt u automatisch afgemeld." - -#~ msgid "This system will be automatically shut down in %d second." -#~ msgid_plural "This system will be automatically shut down in %d seconds." -#~ msgstr[0] "Over %d seconde wordt de computer automatisch afgesloten." -#~ msgstr[1] "Over %d seconden wordt de computer automatisch afgesloten." - -#~ msgid "This system will be automatically restarted in %d second." -#~ msgid_plural "This system will be automatically restarted in %d seconds." -#~ msgstr[0] "Over %d seconde wordt de computer automatisch opnieuw opgestart." -#~ msgstr[1] "" -#~ "Over %d seconden wordt de computer automatisch opnieuw opgestart." - -#~ msgid "You are currently logged in as \"%s\"." -#~ msgstr "U bent momenteel aangemeld onder de naam ‘%s’." - -# afsluiten/uitschakelen/uitzetten -#~ msgid "Log out of this system now?" -#~ msgstr "Afmelden van deze computer?" - -#~ msgid "_Switch User" -#~ msgstr "Gebruiker _wisselen" - -# afsluiten/uitschakelen/uitzetten -#~ msgid "Shut down this system now?" -#~ msgstr "Deze computer uitzetten?" - -#~ msgid "S_uspend" -#~ msgstr "_Pauzestand" - -#~ msgid "_Hibernate" -#~ msgstr "_Slaapstand" - -#~ msgid "_Restart" -#~ msgstr "_Opnieuw opstarten" - -#~ msgid "_Shut Down" -#~ msgstr "_Uitzetten" - -# afsluiten/uitschakelen/uitzetten -#~ msgid "Restart this system now?" -#~ msgstr "Deze computer opnieuw opstarten?" - -#~ msgid "%d hour" -#~ msgid_plural "%d hours" -#~ msgstr[0] "%d uur" -#~ msgstr[1] "%d uren" - -#~ msgid "%d minute" -#~ msgid_plural "%d minutes" -#~ msgstr[0] "%d minuut" -#~ msgstr[1] "%d minuten" - -#~ msgid "%d second" -#~ msgid_plural "%d seconds" -#~ msgstr[0] "%d seconde" -#~ msgstr[1] "%d seconden" - -#~ msgid "0 seconds" -#~ msgstr "0 seconden" - -#~ msgid "Automatic logout in %s" -#~ msgstr "Automatisch afmelden over %s" - -#~ msgid "" -#~ "This session is configured to automatically log out after a period of " -#~ "inactivity." -#~ msgstr "" -#~ "Deze sessie is ingesteld om automatisch af te melden na een periode van " -#~ "inactiviteit." +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Niet herkende uitvoeringsoptie: %d" diff -Nru gnome-session-3.16.0/po/oc.po gnome-session-3.18.1.2/po/oc.po --- gnome-session-3.16.0/po/oc.po 2014-12-05 19:58:27.000000000 +0000 +++ gnome-session-3.18.1.2/po/oc.po 2015-09-16 17:18:35.000000000 +0000 @@ -1,657 +1,534 @@ -# Translation of oc.po to Occitan # Occitan translation of gnome-session. -# Copyright (C) 2007 Free Software Foundation, Inc. -# This file is released under the same license as the gnome-session package. -# +# Copyright (C) 1998-2012 Free Software Foundation, Inc. # Yannig Marchegay (Kokoyaya) , 2007. +# Cédric Valmary (Tot en òc) , 2015. msgid "" msgstr "" -"Project-Id-Version: oc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-07 10:21+0100\n" -"PO-Revision-Date: 2008-02-26 23:10+0100\n" -"Last-Translator: Yannig Marchegay (Kokoyaya) \n" -"Language-Team: Occitan \n" +"Project-Id-Version: gnome-session.HEAD\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-05-10 08:20+0000\n" +"PO-Revision-Date: 2015-05-10 15:02+0200\n" +"Last-Translator: Cédric Valmary (Tot en òc) \n" +"Language-Team: Tot en òc (totenoc.eu)\n" +"Language: fr\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" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: gnome\n" -#: ../data/gnome-session.schemas.in.h:1 -msgid "Allow TCP connections" -msgstr "Autorisar las connexions TCP" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Personalizat" + +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Aquesta causida permet d'accedir a una sesilha enregistrada" -#: ../data/gnome-session.schemas.in.h:2 -msgid "" -"For security reasons, on platforms which have _IceTcpTransNoListen() " -"(XFree86 systems), gnome-session does not listen for connections on TCP " -"ports. This option will allow connections from (authorized) remote hosts. " -"gnome-session must be restarted for this to take effect." -msgstr "" -"Per rasons de seguritat, sus la plataformas qu'an _IceTcpTransNoListen() " -"(sistèmas XFree86), gnome-session susvelha pas las connexions als pòrts TCP. " -"Aquesta opcion permetrà de connexions d'òstes TCP (autorisats). Debètz " -"tornar aviar gnome-session per que foncione." +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Aquesta sesilha vos connècta dins GNOME" + +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +msgid "GNOME dummy" +msgstr "GNOME factici" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME sus Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Aquesta sesilha vos connècta dins GNOME, en utilizant Wayland" + +#: ../data/session-selector.ui.h:1 +msgid "Custom Session" +msgstr "Sesilha personalizada" + +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 +msgid "Please select a custom session to run" +msgstr "Causissètz una sesilha personalizada d'aviar" + +#: ../data/session-selector.ui.h:3 +msgid "_New Session" +msgstr "Sesilha _novèla" + +#: ../data/session-selector.ui.h:4 +msgid "_Remove Session" +msgstr "Sup_rimir la sesilha" + +#: ../data/session-selector.ui.h:5 +msgid "Rena_me Session" +msgstr "Reno_menar la sesilha" -#: ../data/gnome-session.schemas.in.h:3 -msgid "If enabled, gnome-session will prompt the user before ending a session." +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "_Contunhar" + +#: ../data/session-properties.ui.h:1 +msgid "Additional startup _programs:" +msgstr "_Programas suplementaris a l'aviada :" + +#: ../data/session-properties.ui.h:2 +msgid "Startup Programs" +msgstr "Programas a l'aviada" + +#: ../data/session-properties.ui.h:3 +msgid "_Automatically remember running applications when logging out" msgstr "" +"Se remembrar _automaticament de las aplicacions en cors d'execucion al " +"moment de la desconnexion" + +#: ../data/session-properties.ui.h:4 +msgid "_Remember Currently Running Applications" +msgstr "_Se remembrar de las aplicacions en cors d'execucion" + +#: ../data/session-properties.ui.h:5 +msgid "Options" +msgstr "Opcions" -#: ../data/gnome-session.schemas.in.h:4 +#: ../data/session-properties.ui.h:6 +msgid "Browse…" +msgstr "Percórrer…" + +#: ../data/session-properties.ui.h:7 +msgid "Comm_ent:" +msgstr "Co_mentari :" + +#: ../data/session-properties.ui.h:8 +msgid "Co_mmand:" +msgstr "_Comanda :" + +#: ../data/session-properties.ui.h:9 +msgid "_Name:" +msgstr "_Nom :" + +#: ../gnome-session/gsm-fail-whale-dialog.c:313 +msgid "Oh no! Something has gone wrong." +msgstr "Ò damne ! Quicòm a trucat." + +#: ../gnome-session/gsm-fail-whale-dialog.c:320 msgid "" -"If enabled, gnome-session will save the session automatically. Otherwise, " -"the logout dialog will have an option to save the session." +"A problem has occurred and the system can't recover. Please contact a system " +"administrator" msgstr "" -"S'es activat, gnome-session enregistrarà automaticament la session. " -"Autrament, la boita de dialòg de desconnexion prepausarà una opcion per " -"enregistrar la sesilha." - -#: ../data/gnome-session.schemas.in.h:5 -msgid "Logout prompt" -msgstr "Indicador de sortida" - -#: ../data/gnome-session.schemas.in.h:6 -msgid "Preferred Image to use for login splash screen" -msgstr "Imatges preferits per l'ecran d'acuèlh" - -#: ../data/gnome-session.schemas.in.h:7 -msgid "Save sessions" -msgstr "Enregistrar las sessions" - -#: ../data/gnome-session.schemas.in.h:8 -msgid "Selected option in the log out dialog" -msgstr "Opcion seleccionada a la bosta de dialòg de sortida" - -#: ../data/gnome-session.schemas.in.h:9 -msgid "Show the splash screen" -msgstr "Visualizar l'ecran d'acuèlh" - -#: ../data/gnome-session.schemas.in.h:10 -msgid "Show the splash screen when the session starts up" -msgstr "Visualizar l'ecran d'acuèlh al iniciar la session" +"Un problèma s'es produsit e lo sistèma se pòt pas recuperar. Contactatz un " +"administrator del sistèma" -#: ../data/gnome-session.schemas.in.h:11 +#: ../gnome-session/gsm-fail-whale-dialog.c:322 msgid "" -"This is a relative path value based off the $datadir/pixmaps/ directory. Sub-" -"directories and image names are valid values. Changing this value will " -"effect the next session login." +"A problem has occurred and the system can't recover. All extensions have " +"been disabled as a precaution." msgstr "" -"Aquò's un camin relatiu basat sul repertòri $datadir/pixmaps/. Los " -"sosrepertòris e los noms d'imatges son de valors valablas. Se càmbiatz " -"aquesta valor, aquò prendrà efècte a la debuta de la sesilha venenta." +"Un problèma s'es produsit e lo sistèma se pòt pas recuperar. Totas las " +"extensions son estadas desactivadas per mesura de precaucion." -#: ../data/gnome-session.schemas.in.h:12 +#: ../gnome-session/gsm-fail-whale-dialog.c:324 msgid "" -"This is the option that will be selected in the logout dialog, valid values " -"are \"logout\" for logging out, \"shutdown\" for halting the system and " -"\"restart\" for restarting the system." +"A problem has occurred and the system can't recover.\n" +"Please log out and try again." msgstr "" -"Aquò's l'opcion que seleccionaretz a la bosta de dialòg de sortida, las " -"valors valablas son \"logout\" per sortir de la sesilha, \"shutdown\" per " -"arrestar lo sistèma, e \"restart\" per tornar lançar." +"Un problèma s'es produsit e lo sistèma se pòt pas recuperar.\n" +"Desconnectatz-vos e ensajatz tornamai." -#: ../data/gnome.desktop.in.h:1 -msgid "GNOME" -msgstr "GNOME" +#: ../gnome-session/gsm-fail-whale-dialog.c:339 +msgid "_Log Out" +msgstr "_Tampar la sesilha" -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "La session vos connectarà dins GNOME" +#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:243 +msgid "Enable debugging code" +msgstr "Activa lo còde de desbugatge" -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Configure your sessions" -msgstr "Configurar vòstras sesilhas" +#: ../gnome-session/gsm-fail-whale-dialog.c:362 +msgid "Allow logout" +msgstr "Autorizar la desconnexion" -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Sessions" -msgstr "Sessions" +#: ../gnome-session/gsm-fail-whale-dialog.c:363 +msgid "Show extension warning" +msgstr "Afichar l'avertiment per las extensions" -#: ../gnome-session/gsm-at-startup.c:39 -msgid "" -"Assistive technology support has been requested for this session, but the " -"accessibility registry was not found. Please ensure that the AT-SPI package " -"is installed. Your session has been started without assistive technology " -"support." -msgstr "" +#: ../gnome-session/gsm-manager.c:1251 ../gnome-session/gsm-manager.c:1896 +msgid "Not responding" +msgstr "Abséncia de responsa" -#: ../gnome-session/gsm-client-editor.c:123 -msgid "_Order:" -msgstr "_Òrdre :" - -#: ../gnome-session/gsm-client-editor.c:125 -msgid "The order in which applications are started in the session." -msgstr "Òrdre d'aviada de las aplicacions de la sesilha." - -#: ../gnome-session/gsm-client-editor.c:133 -msgid "What happens to the application when it exits." -msgstr "Qu'arriba passa amb lo logicial quand se quita." - -#: ../gnome-session/gsm-client-editor.c:134 -msgid "_Style:" -msgstr "_Estil :" - -#: ../gnome-session/gsm-client-list.c:44 -msgid "Inactive" -msgstr "Inactiu" - -#: ../gnome-session/gsm-client-list.c:44 -msgid "Waiting to start or already finished." -msgstr "En espera de se lançar o lançament ja acabat." - -#: ../gnome-session/gsm-client-list.c:46 -msgid "Starting" -msgstr "Aviada" - -#: ../gnome-session/gsm-client-list.c:46 -msgid "Started but has not yet reported state." -msgstr "Lançat mas pas encara de rapòrt de son estat." - -#: ../gnome-session/gsm-client-list.c:48 -msgid "Running" -msgstr "En foncionament" - -#: ../gnome-session/gsm-client-list.c:48 -msgid "A normal member of the session." -msgstr "Un utilizaire normal de la sesilha." - -#: ../gnome-session/gsm-client-list.c:50 -msgid "Saving" -msgstr "A enregistrar" - -#: ../gnome-session/gsm-client-list.c:50 -msgid "Saving session details." -msgstr "A enregistrar los detalhs de la sesilha." - -#. FIXME find better icon -#: ../gnome-session/gsm-client-list.c:53 -msgid "Unknown" -msgstr "Desconegut" - -#: ../gnome-session/gsm-client-list.c:53 -msgid "State not reported within timeout." -msgstr "L'estat es pas estat reportat pendent lo relambi autorizat." - -#. FIXME find icon -#: ../gnome-session/gsm-client-list.c:60 -msgid "Normal" -msgstr "Normal" - -#: ../gnome-session/gsm-client-list.c:60 -msgid "Unaffected by logouts but can die." -msgstr "Las sortidas l'afectan pas mas pòt morir." - -#: ../gnome-session/gsm-client-list.c:62 -msgid "Restart" -msgstr "Tornar lançar" - -#: ../gnome-session/gsm-client-list.c:62 -msgid "Never allowed to die." -msgstr "Permetre pas jamai que morisca." - -#: ../gnome-session/gsm-client-list.c:64 -msgid "Trash" -msgstr "Banasta" - -#: ../gnome-session/gsm-client-list.c:64 -msgid "Discarded on logout and can die." -msgstr "Escartat a la sortida, pòt morir." - -#: ../gnome-session/gsm-client-list.c:66 -msgid "Settings" -msgstr "Paramètres" - -#: ../gnome-session/gsm-client-list.c:66 -msgid "Always started on every login." -msgstr "Lançat a cada intrada de sesilha." - -#: ../gnome-session/gsm-client-list.c:190 -msgid "Order" -msgstr "Òrdre" - -#: ../gnome-session/gsm-client-list.c:197 -msgid "Style" -msgstr "Estil" - -#: ../gnome-session/gsm-client-list.c:204 -msgid "State" -msgstr "Estat" - -#: ../gnome-session/gsm-client-list.c:211 -#: ../gnome-session/session-properties-capplet.c:284 -msgid "Program" -msgstr "Programa" +#: ../gnome-session/gsm-util.c:381 +msgid "_Log out" +msgstr "_Se desconnectar" +#. It'd be really surprising to reach this code: if we're here, +#. * then the XSMP client already has set several XSMP +#. * properties. But it could still be that SmProgram is not set. #. -#. * it would be nice to have a dialog which either: -#. * -#. * 1. lets you change the message on it -#. * 2. lets you append messages and has a "history" -#. * -#. * for now, we just kill the old dialog and pop up a new one. -#. -#: ../gnome-session/gsm-gsd.c:47 +#: ../gnome-session/gsm-xsmp-client.c:557 +msgid "Remembered Application" +msgstr "Aplicacions memorizadas" + +#: ../gnome-session/gsm-xsmp-client.c:1207 +msgid "This program is blocking logout." +msgstr "Aqueste programa blòca la desconnexion." + +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" -"There was an error starting the GNOME Settings Daemon.\n" -"\n" -"Some things, such as themes, sounds, or background settings may not work " -"correctly." +"Refusing new client connection because the session is currently being shut " +"down\n" msgstr "" -"I a aguda una error al lançar los paramètres de GNOME (GNOME Settings " -"Daemon). \n" -"\n" -"Se pòt que d'unas causas, coma los tèmas, los sons o los paramètres de fond " -"foncionen pas correctament." +"Refús de la connexion d'un novèl client perque la sesilha es actualament en " +"cors de tampadura\n" + +#: ../gnome-session/gsm-xsmp-server.c:609 +#, c-format +msgid "Could not create ICE listening socket: %s" +msgstr "Impossible de crear lo connectador d'escota ICE : %s" + +#: ../gnome-session/main.c:241 +msgid "Override standard autostart directories" +msgstr "Remplaça los repertòris autostart estandards" + +#: ../gnome-session/main.c:241 +msgid "AUTOSTART_DIR" +msgstr "REP_AUTOSTART" + +#: ../gnome-session/main.c:242 +msgid "Session to use" +msgstr "Sesilha d'utilizar" + +#: ../gnome-session/main.c:242 +msgid "SESSION_NAME" +msgstr "NOM_SESILHA" -#: ../gnome-session/gsm-gsd.c:59 +#: ../gnome-session/main.c:244 +msgid "Do not load user-specified applications" +msgstr "Carga pas las aplicacions demandadas per l'utilizaire" + +#: ../gnome-session/main.c:245 +msgid "Version of this application" +msgstr "Version d'aquesta aplicacion" + +#. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong +#: ../gnome-session/main.c:247 +msgid "Show the fail whale dialog for testing" +msgstr "Afichar lo dialòg d'error per lo testar" + +#: ../gnome-session/main.c:248 +msgid "Disable hardware acceleration check" +msgstr "Desactivar la verificacion de l'acceleracion materiala" + +#: ../gnome-session/main.c:267 +msgid " - the GNOME session manager" +msgstr "- lo gestionari de sesilhas de GNOME" + +#: ../tools/gnome-session-inhibit.c:108 +#, c-format msgid "" +"%s [OPTION...] COMMAND\n" "\n" +"Execute COMMAND while inhibiting some session functionality.\n" "\n" -"The last error message was:\n" +" -h, --help Show this help\n" +" --version Show program version\n" +" --app-id ID The application id to use\n" +" when inhibiting (optional)\n" +" --reason REASON The reason for inhibiting (optional)\n" +" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Do not launch COMMAND and wait forever instead\n" "\n" +"If no --inhibit option is specified, idle is assumed.\n" msgstr "" +"%s [OPCION...] COMANDA\n" "\n" +"Executa COMANDA tot en inibant de foncionalitats de la sesilha.\n" "\n" -"Lo darrièr messatge d'error èra :\n" -"\n" - -#: ../gnome-session/gsm-gsd.c:64 -msgid "" -"\n" -"\n" -"GNOME will still try to restart the Settings Daemon next time you log in." -msgstr "" +" -h, --help Afichar aquesta ajuda\n" +" --version Afichar la version del programa\n" +" --app-id ID L'identificant d'aplicacion d'utilizar\n" +" al moment de l'inibicion (opcional)\n" +" --reason REASON La rason de l'inibicion (opcional)\n" +" --inhibit ARG Las causes d'inibir, lista separada per de punts dobles " +"demest :\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Aviar pas COMANDA e esperar indefinidament a la plaça\n" "\n" -"\n" -"GNOME ensajarà de tornar lançar lo programa de configuracion a lançament de " -"vòstra sesilha venenta." - -#: ../gnome-session/gsm-gsd.c:162 -msgid "The Settings Daemon restarted too many times." -msgstr "Lo programa de configuracion se tornèt lançar de tròp." - -#. Name is mandatory and might not be set by the caller -#: ../gnome-session/gsm-keyfile.c:43 -msgid "No Name" -msgstr "" +"Se cap d'opcion --inhibit es pas precisada, « idle » es supausat.\n" -#: ../gnome-session/gnome-session-remove.c:50 -msgid "List registered clients, then exit" -msgstr "" +#: ../tools/gnome-session-inhibit.c:146 +#, c-format +msgid "Failed to execute %s\n" +msgstr "Impossible d'executar %s\n" -#: ../gnome-session/gnome-session-remove.c:52 -msgid "PROGRAM..." -msgstr "PROGRAMA..." +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s necessita un paramètre\n" -#: ../gnome-session/gnome-session-remove.c:176 +#: ../tools/gnome-session-selector.c:61 #, c-format +msgid "Session %d" +msgstr "Sesilha %d" + +#: ../tools/gnome-session-selector.c:107 msgid "" -"You must specify at least one program to remove. You can list the programs " -"with --list.\n" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "" +"Los noms de sesilhas pòdon pas començar per « . » o conténer lo caractèr « / " +"»" -#: ../gnome-session/gnome-session-remove.c:183 -#, c-format -msgid "Error: could not connect to the session manager\n" -msgstr "" +#: ../tools/gnome-session-selector.c:111 +msgid "Session names are not allowed to start with ‘.’" +msgstr "Los noms de sesilhas pòdon pas començar per « . »" -#: ../gnome-session/gnome-session-remove.c:197 -#, c-format -msgid "Currently registered clients:\n" -msgstr "" +#: ../tools/gnome-session-selector.c:115 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "Los noms de sesilhas pòdon pas conténer lo caractèr « / »" -#: ../gnome-session/gnome-session-remove.c:207 +#: ../tools/gnome-session-selector.c:123 #, c-format -msgid "Couldn't find program %s in session\n" -msgstr "" +msgid "A session named ‘%s’ already exists" +msgstr "Una sesilha nomenada « %s » existís ja" -#. At least try to tell the user something. -#: ../gnome-session/ice.c:355 -#, c-format -msgid "" -"The GNOME session manager cannot start properly. Please report this as a " -"GNOME bug. Please include this ICE failure message in the bug report: '%" -"s'. Meanwhile you could try logging in using the failsafe session." -msgstr "" +#: ../tools/gnome-session-quit.c:49 +msgid "Log out" +msgstr "Se desconnècta" -#: ../gnome-session/ice.c:514 -#, c-format -msgid "" -"The GNOME session manager was unable to lock the file '%s'. Please report " -"this as a GNOME bug. Sometimes this error may occur if the file's directory " -"is unwritable, you could try logging in via the failsafe session and " -"ensuring that it is." -msgstr "" +#: ../tools/gnome-session-quit.c:50 +msgid "Power off" +msgstr "S'atuda" -#: ../gnome-session/ice.c:541 -#, c-format -msgid "" -"The GNOME session manager was unable to read the file: '%s'. If this file " -"exists it must be readable by you for GNOME to work properly. Try logging " -"in with the failsafe session and removing this file." -msgstr "" +#: ../tools/gnome-session-quit.c:51 +msgid "Reboot" +msgstr "Reaviar" -#: ../gnome-session/ice.c:586 -#, c-format -msgid "" -"Could not write to file '%s'. This file must be writable in order for GNOME " -"to function properly. Try logging in with the failsafe session and removing " -"this file. Also make sure that the file's directory is writable." -msgstr "" +#: ../tools/gnome-session-quit.c:52 +msgid "Ignoring any existing inhibitors" +msgstr "Ignorar tot inibitor existent" -#: ../gnome-session/logout.c:392 -msgid "Are you sure you want to log out?" -msgstr "" +#: ../tools/gnome-session-quit.c:53 +msgid "Don't prompt for user confirmation" +msgstr "Demanda pas de confirmacion" -#: ../gnome-session/logout.c:409 -msgid "Remember running applications" -msgstr "" +#: ../tools/gnome-session-quit.c:87 ../tools/gnome-session-quit.c:101 +msgid "Could not connect to the session manager" +msgstr "Impossible de se connectar al gestionari de sesilhas" -#: ../gnome-session/logout.c:432 -msgid "Action" -msgstr "Accion" +#: ../tools/gnome-session-quit.c:196 +msgid "Program called with conflicting options" +msgstr "Programa apelat amb d'opcions conflictualas" -#: ../gnome-session/logout.c:449 -msgid "_Log out" -msgstr "" +#~ msgid "Select Command" +#~ msgstr "Sélection d'une commande" -#: ../gnome-session/logout.c:456 -msgid "Sh_ut down" -msgstr "" +#~ msgid "Add Startup Program" +#~ msgstr "Ajout d'un programme de démarrage" -#: ../gnome-session/logout.c:464 -msgid "_Restart the computer" -msgstr "_Tornar aviar l'ordenador" - -#: ../gnome-session/main.c:86 -msgid "Specify a session name to load" -msgstr "Especifica lo nom de la sesilha de cargar" - -#: ../gnome-session/main.c:86 ../gnome-session/gnome-session-save.c:48 -msgid "NAME" -msgstr "NOM" - -#: ../gnome-session/main.c:87 -msgid "Only read saved sessions from the default.session file" -msgstr "Legir sonque las sesilhas salvadas al fichièr default.session" +#~ msgid "Edit Startup Program" +#~ msgstr "Modification d'un programme de démarrage" -#: ../gnome-session/main.c:88 -msgid "Millisecond period spent waiting for clients to register (0=forever)" -msgstr "" -"Relambi d'espèra, en millisegondas, per que los clients se registren " -"(0=indefiniament)" +#~ msgid "The startup command cannot be empty" +#~ msgstr "La commande de démarrage ne peut pas être vide" -#: ../gnome-session/main.c:88 ../gnome-session/main.c:89 -#: ../gnome-session/main.c:90 -msgid "DELAY" -msgstr "" +#~ msgid "The startup command is not valid" +#~ msgstr "La commande de démarrage n'est pas valide" -#: ../gnome-session/main.c:89 -msgid "Millisecond period spent waiting for clients to respond (0=forever)" -msgstr "" -"Relambi d'espèra, en millisegondas, per que los clients respondan " -"(0=indefiniament)" +#~ msgid "Enabled" +#~ msgstr "Activé" -#: ../gnome-session/main.c:90 -msgid "Millisecond period spent waiting for clients to die (0=forever)" -msgstr "" -"Relambi d'espèra, en millisegondas, per que los clients moriscan " -"(0=indefiniament)" +#~ msgid "Icon" +#~ msgstr "Icône" -#: ../gnome-session/main.c:166 -msgid "This session is running as a privileged user" -msgstr "" +#~ msgid "Program" +#~ msgstr "Programme" -#: ../gnome-session/main.c:168 -msgid "" -"Running a session as a privileged user should be avoided for security " -"reasons. If possible, you should log in as a normal user." -msgstr "" +#~ msgid "Startup Applications Preferences" +#~ msgstr "Préférences des applications au démarrage" -#: ../gnome-session/main.c:172 -msgid "_Continue" -msgstr "_Contunhar" +#~ msgid "No name" +#~ msgstr "Pas de nom" -#: ../gnome-session/main.c:256 -#, c-format -msgid "" -"The session might encounter issues if the computer clock is not properly " -"configured. Please consider adjusting it.\n" -"\n" -"Current date is %s." -msgstr "" +#~ msgid "No description" +#~ msgstr "Pas de description" -#: ../gnome-session/main.c:375 -#, c-format -msgid "Failed to launch time configuration tool: %s" -msgstr "Impossible d'executar l'esplech de configuracion de l'ora : %s" +#~ msgid "Could not display help document" +#~ msgstr "Impossible d'afficher le document d'aide" -#: ../gnome-session/main.c:406 -msgid "The computer clock appears to be wrong" -msgstr "" +#~ msgid "Startup Applications" +#~ msgstr "Applications au démarrage" -#: ../gnome-session/main.c:413 -msgid "_Ignore" -msgstr "_Ignorar" +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "Choisir les applications à lancer à la connexion" -#: ../gnome-session/main.c:414 -msgid "_Adjust the Clock" -msgstr "" +#~ msgid "File is not a valid .desktop file" +#~ msgstr "Le fichier n'est pas un fichier .desktop valide" -#: ../gnome-session/main.c:551 -#, c-format -msgid "" -"Could not look up internet address for %s.\n" -"This will prevent GNOME from operating correctly.\n" -"It may be possible to correct the problem by adding\n" -"%s to the file /etc/hosts." -msgstr "" -"S'es pas poscut cercar l'adreça electronica de %s.\n" -"Aquò empacharà GNOME de foncionar corrèctament. \n" -"Se pòt benlèu adobar aqueste problèma en apondre\n" -"%s al fichièr /etc/hosts." - -#: ../gnome-session/main.c:558 -msgid "Log in Anyway" -msgstr "Se connectar ça que la" - -#: ../gnome-session/main.c:559 -msgid "Try Again" -msgstr "Tornar ensajar" - -#: ../gnome-session/main.c:693 -msgid "- Manage the GNOME session" -msgstr "- Gerir la sesilha GNOME" - -#: ../gnome-session/manager.c:513 -msgid "Wait abandoned due to conflict." -msgstr "L'espera s'es arrestada per causa d'un conflicte." +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "La version « %s » du fichier .desktop n'est pas reconnue" -#: ../gnome-session/manager.c:1021 -#, c-format -msgid "No response to the %s command." -msgstr "Pas cap de responsa a la comanda %s." +#~ msgid "Starting %s" +#~ msgstr "Démarrage de %s" -#: ../gnome-session/manager.c:1022 -msgid "The program may be slow, stopped or broken." -msgstr "Se pòt que lo programa siá alentit, arrestat o degalhat." - -#: ../gnome-session/manager.c:1023 -msgid "You may wait for it to respond or remove it." -msgstr "Podètz esperar sa responsa o lo suprimir." - -#: ../gnome-session/manager.c:1749 -msgid "Restart abandoned due to failures." -msgstr "Se tornèt pas lançar pr'amor d'errors." - -#: ../gnome-session/manager.c:1945 -msgid "A session shutdown is in progress." -msgstr "Sesilha a se tampar." - -#: ../gnome-session/gnome-session-save.c:48 -msgid "Set the current session name" -msgstr "Definir lo nom de la session activa" - -#: ../gnome-session/gnome-session-save.c:49 -msgid "Kill session" -msgstr "Tuar la sesilha" +#~ msgid "Application does not accept documents on command line" +#~ msgstr "L'application n'accepte pas de documents en ligne de commande" -#: ../gnome-session/gnome-session-save.c:50 -msgid "Use dialog boxes for errors" -msgstr "" +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Option de démarrage non reconnue : %d" -#: ../gnome-session/gnome-session-save.c:51 -msgid "Do not require confirmation" -msgstr "Demandar pas de confirmacion" +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "Impossible de passer des URI de document à un fichier de bureau avec " +#~ "« Type=Link »" -#: ../gnome-session/gnome-session-save.c:149 -#: ../gnome-session/gnome-session-save.c:187 -msgid "Could not connect to the session manager" -msgstr "Impossible de se connectar al gestionari de sesilhas" +#~ msgid "Not a launchable item" +#~ msgstr "Cet élément ne peut être lancé" -#: ../gnome-session/gnome-session-save.c:172 -msgid "- Save the current session" -msgstr "- Enregistrar la session activa" +#~ msgid "Disable connection to session manager" +#~ msgstr "Désactive la connexion au gestionnaire de sessions" -#: ../gnome-session/session-properties-capplet.c:154 -msgid "Save changes to the current session before closing?" -msgstr "" +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Indique le fichier contenant la configuration enregistrée" -#: ../gnome-session/session-properties-capplet.c:156 -msgid "If you don't save, changes will be discarded." -msgstr "" +#~ msgid "FILE" +#~ msgstr "FICHIER" -#: ../gnome-session/session-properties-capplet.c:159 -msgid "_Close without Saving" -msgstr "_Tampar sens enregistrar" +#~ msgid "Specify session management ID" +#~ msgstr "Indique l'identificateur de la gestion de sessions" -#: ../gnome-session/session-properties-capplet.c:224 -msgid "Sessions Preferences" -msgstr "" +#~ msgid "ID" +#~ msgstr "ID" -#. non-session managed startup programs -#: ../gnome-session/session-properties-capplet.c:250 -msgid "Additional startup _programs:" -msgstr "Programas adicionals de lançament :" +#~ msgid "Session management options:" +#~ msgstr "Options de la gestion de sessions :" -#: ../gnome-session/session-properties-capplet.c:275 -msgid "Enabled" -msgstr "Activat" +#~ msgid "Show session management options" +#~ msgstr "Affiche les options de la gestion de sessions" -#: ../gnome-session/session-properties-capplet.c:319 -msgid "Startup Programs" -msgstr "Programas de lançament" +#~ msgid "Some programs are still running:" +#~ msgstr "Des programmes sont toujours en cours d'exécution :" -#: ../gnome-session/session-properties-capplet.c:326 -msgid "Current Session" -msgstr "Sesilha en cors" +#~ msgid "Unknown" +#~ msgstr "Inconnu" -#. Autosave -#: ../gnome-session/session-properties-capplet.c:337 -msgid "_Automatically remember running applications when logging out" -msgstr "" +#~ msgid "A program is still running:" +#~ msgstr "Un programme est toujours en cours d'exécution :" -#: ../gnome-session/session-properties-capplet.c:353 -msgid "_Remember Currently Running Applications" -msgstr "" +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Attente de la fin du programme. L'interruption du programme risquerait de " +#~ "vous faire perdre certaines données." -#: ../gnome-session/session-properties-capplet.c:361 -msgid "Session Options" -msgstr "Opcions de la sesilha" +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Attente de la fin des programmes. L'interruption de ces programmes " +#~ "risquerait de vous faire perdre certaines données." -#: ../gnome-session/session-properties-capplet.c:457 -msgid "Your session has been saved." -msgstr "" +#~ msgid "Switch User Anyway" +#~ msgstr "Changer d'utilisateur malgré tout" -#: ../gnome-session/session-properties-capplet.c:500 -#, c-format -msgid "could not connect to the session manager\n" -msgstr "" +#~ msgid "Log Out Anyway" +#~ msgstr "Se déconnecter malgré tout" -#: ../gnome-session/session-properties-capplet.c:506 -#, c-format -msgid "session manager does not support GNOME extensions\n" -msgstr "" +#~ msgid "Suspend Anyway" +#~ msgstr "Mettre en veille malgré tout" -#: ../gnome-session/session-properties.c:51 -msgid "Remove the currently selected client from the session." -msgstr "Suprimir lo client seleccionat de la sesilha." - -#: ../gnome-session/session-properties.c:57 -msgid "Apply changes to the current session" -msgstr "Aplicar las modificacions a la sesilha en cors" - -#: ../gnome-session/session-properties.c:63 -msgid "The list of programs in the session." -msgstr "La lista dels programas de la sesilha." - -#: ../gnome-session/session-properties.c:89 -msgid "Currently running _programs:" -msgstr "_Programas en cors d'execucion :" - -#: ../gnome-session/splash-widget.c:44 -msgid "Sawfish Window Manager" -msgstr "Gestionari de fenèstras Sawfish" - -#: ../gnome-session/splash-widget.c:45 -msgid "Metacity Window Manager" -msgstr "Gestionari de fenèstras Metacity" - -#: ../gnome-session/splash-widget.c:46 -msgid "Window Manager" -msgstr "Gestionari de fenèstras" - -#: ../gnome-session/splash-widget.c:47 -msgid "The Panel" -msgstr "Lo panèl" - -#: ../gnome-session/splash-widget.c:48 -msgid "Nautilus" -msgstr "Nautilus" - -#: ../gnome-session/splash-widget.c:49 -msgid "Desktop Settings" -msgstr "Paramètres del burèu" - -#: ../gnome-session/startup-programs.c:348 -msgid "No description" -msgstr "Pas de descripcion" +#~ msgid "Hibernate Anyway" +#~ msgstr "Hiberner malgré tout" -#: ../gnome-session/startup-programs.c:409 -msgid "Select Command" -msgstr "" +#~ msgid "Shut Down Anyway" +#~ msgstr "Éteindre malgré tout" -#: ../gnome-session/startup-programs.c:471 -msgid "_Name:" -msgstr "_Nom :" +#~ msgid "Restart Anyway" +#~ msgstr "Redémarrer malgré tout" -#: ../gnome-session/startup-programs.c:486 -msgid "Co_mmand:" -msgstr "_Comanda :" +#~ msgid "Lock Screen" +#~ msgstr "Verrouiller l'écran" -#: ../gnome-session/startup-programs.c:498 -msgid "_Browse..." -msgstr "_Examinar..." +#~ msgid "Cancel" +#~ msgstr "Annuler" -#: ../gnome-session/startup-programs.c:510 -msgid "Comm_ent:" -msgstr "Co_mentari :" +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Vous serez automatiquement déconnecté dans %d seconde." +#~ msgstr[1] "Vous serez automatiquement déconnecté dans %d secondes." -#: ../gnome-session/startup-programs.c:538 -msgid "The name of the startup program cannot be empty" -msgstr "" +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Cet ordinateur va s'éteindre automatiquement dans %d seconde." +#~ msgstr[1] "Cet ordinateur va s'éteindre automatiquement dans %d secondes." -#: ../gnome-session/startup-programs.c:540 -msgid "The startup command cannot be empty" -msgstr "La comanda de lançament pòt pas èsser voida" +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Cet ordinateur va redémarrer automatiquement dans %d seconde." +#~ msgstr[1] "Cet ordinateur va redémarrer automatiquement dans %d secondes." -#: ../gnome-session/startup-programs.c:546 -msgid "The startup command is not valid" -msgstr "" +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Vous êtes actuellement connecté en tant que « %s »." -#: ../gnome-session/startup-programs.c:603 -msgid "Add Startup Program" -msgstr "" +#~ msgid "Log out of this system now?" +#~ msgstr "Se déconnecter du système maintenant ?" + +#~ msgid "_Switch User" +#~ msgstr "Changer d'_utilisateur" + +#~ msgid "Shut down this system now?" +#~ msgstr "Éteindre cet ordinateur maintenant ?" + +#~ msgid "S_uspend" +#~ msgstr "_Mettre en veille" + +#~ msgid "_Hibernate" +#~ msgstr "_Hiberner" + +#~ msgid "_Restart" +#~ msgstr "_Redémarrer" + +#~ msgid "_Shut Down" +#~ msgstr "Ét_eindre" + +#~ msgid "Restart this system now?" +#~ msgstr "Redémarrer cet ordinateur maintenant ?" + +#~ msgid "Icon '%s' not found" +#~ msgstr "Icône « %s » non trouvée" + +#~ msgid "GNOME 3 Failed to Load" +#~ msgstr "Échec du chargement de GNOME 3" + +#~ msgid "" +#~ "Unfortunately GNOME 3 failed to start properly and started in the " +#~ "fallback mode.\n" +#~ "\n" +#~ "This most likely means your system (graphics hardware or driver) is not " +#~ "capable of delivering the full GNOME 3 experience." +#~ msgstr "" +#~ "GNOME 3 n'a malheureusement pas réussi à démarrer correctement et a " +#~ "démarré en mode restreint.\n" +#~ "\n" +#~ "Cela signifie probablement que votre système (la carte graphique ou son " +#~ "pilote) n'est pas assez puissant pour prendre en charge tous les éléments " +#~ "du bureau GNOME 3." + +#~ msgid "Learn more about GNOME 3" +#~ msgstr "En apprendre plus sur GNOME 3" + +#~ msgid "" +#~ "Unable to start login session (and unable to connect to the X server)" +#~ msgstr "Impossible de démarrer la session (et de se connecter au serveur X)" + +#~ msgid "Exited with code %d" +#~ msgstr "Quitté avec le code %d" + +#~ msgid "Killed by signal %d" +#~ msgstr "Tué par le signal %d" -#: ../gnome-session/startup-programs.c:647 -msgid "Edit Startup Program" -msgstr "Editar lo programa de lançament" +#~ msgid "Stopped by signal %d" +#~ msgstr "Interrompu par le signal %d" diff -Nru gnome-session-3.16.0/po/pl.po gnome-session-3.18.1.2/po/pl.po --- gnome-session-3.16.0/po/pl.po 2015-03-09 14:49:53.000000000 +0000 +++ gnome-session-3.18.1.2/po/pl.po 2015-09-16 17:18:35.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-04 22:55+0100\n" -"PO-Revision-Date: 2015-03-04 22:57+0100\n" +"POT-Creation-Date: 2015-08-24 16:14+0200\n" +"PO-Revision-Date: 2015-08-24 16:15+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -228,7 +228,7 @@ #: ../gnome-session/main.c:267 msgid " - the GNOME session manager" -msgstr " - menedżer sesji środowiska GNOME" +msgstr " — menedżer sesji środowiska GNOME" #: ../tools/gnome-session-inhibit.c:108 #, c-format @@ -248,7 +248,7 @@ "\n" "If no --inhibit option is specified, idle is assumed.\n" msgstr "" -"%s [OPCJA...] POLECENIE\n" +"%s [OPCJA…] POLECENIE\n" "\n" "Wykonuje POLECENIE podczas wstrzymywania części funkcjonalności sesji.\n" "\n" @@ -261,12 +261,12 @@ " logout, switch-user, suspend, idle, automount\n" " --inhibit-only Bez wykonywania POLECENIA i czekanie bez ograniczenia\n" "\n" -"Jeśli nie podano opcji --inhibit, to przyjmowana jest opcja \"idle\".\n" +"Jeśli nie podano opcji --inhibit, to przyjmowana jest opcja „idle”.\n" #: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" -msgstr "Wykonanie %s się nie powiodło\n" +msgstr "Wykonanie polecenia „%s” się nie powiodło\n" #: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 #: ../tools/gnome-session-inhibit.c:226 @@ -282,20 +282,20 @@ #: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" -msgstr "Nazwy sesji nie mogą rozpoczynać się od \".\" lub zawierać znaku \"/\"" +msgstr "Nazwy sesji nie mogą rozpoczynać się od „.” lub zawierać znaku „/”" #: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" -msgstr "Nazwy sesji nie mogą rozpoczynać się od \".\"" +msgstr "Nazwy sesji nie mogą rozpoczynać się od „.”" #: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" -msgstr "Nazwy sesji nie mogą zawierać znaku \"/\"" +msgstr "Nazwy sesji nie mogą zawierać znaku „/”" #: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" -msgstr "Sesja o nazwie \"%s\" już istnieje" +msgstr "Sesja o nazwie „%s” już istnieje" #: ../tools/gnome-session-quit.c:49 msgid "Log out" @@ -319,7 +319,7 @@ #: ../tools/gnome-session-quit.c:87 ../tools/gnome-session-quit.c:101 msgid "Could not connect to the session manager" -msgstr "Nie można połączyć się z menedżerem sesji" +msgstr "Nie można połączyć z menedżerem sesji" #: ../tools/gnome-session-quit.c:196 msgid "Program called with conflicting options" diff -Nru gnome-session-3.16.0/po/pt.po gnome-session-3.18.1.2/po/pt.po --- gnome-session-3.16.0/po/pt.po 2014-12-05 19:58:27.000000000 +0000 +++ gnome-session-3.18.1.2/po/pt.po 2015-10-14 13:43:38.000000000 +0000 @@ -4,73 +4,24 @@ # Nuno Ferreira , 1999 # Duarte Loreto , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013. # António Lima , 2013. +# Pedro Albuquerque , 2015. # msgid "" msgstr "" -"Project-Id-Version: 3.8\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-22 23:47+0100\n" -"PO-Revision-Date: 2013-09-21 23:26-0100\n" -"Last-Translator: António Lima \n" -"Language-Team: Português \n" -"Language: \n" +"Project-Id-Version: 3.18\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-06-07 19:55+0000\n" +"PO-Revision-Date: 2015-06-08 08:59+0100\n" +"Last-Translator: Pedro Albuquerque \n" +"Language-Team: Pedro Albuquerque\n" +"Language: pt\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" -"X-Generator: Poedit 1.5.4\n" - -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "Selecionar o Comando" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "Adicionar Aplicação de Arranque" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "Editar Aplicação de Arranque" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "O comando de arranque não pode ser vazio" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "O comando de arranque não é válido" - -#: ../capplet/gsm-properties-dialog.c:519 -msgid "Enabled" -msgstr "Ativo" - -#: ../capplet/gsm-properties-dialog.c:531 -msgid "Icon" -msgstr "Ícone" - -#: ../capplet/gsm-properties-dialog.c:543 -msgid "Program" -msgstr "Aplicação" - -#: ../capplet/gsm-properties-dialog.c:747 -msgid "Startup Applications Preferences" -msgstr "Preferências das Aplicações de Arranque" - -#: ../capplet/gsp-app.c:276 -msgid "No name" -msgstr "Sem nome" - -#: ../capplet/gsp-app.c:282 -msgid "No description" -msgstr "Sem descrição" - -#: ../capplet/main.c:35 ../gnome-session/main.c:309 -msgid "Version of this application" -msgstr "Versão desta aplicação" - -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "Incapaz de apresentar o documento de ajuda" +"X-Generator: Gtranslator 2.91.6\n" +"X-Project-Style: gnome\n" #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" @@ -92,18 +43,10 @@ msgid "GNOME dummy" msgstr "GNOME de teste" -#: ../data/gnome-session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Aplicações de Arranque" - -#: ../data/gnome-session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Selecione que aplicações arrancar ao iniciar uma sessão" - #: ../data/gnome-wayland.desktop.in.h:1 #: ../data/gnome-wayland.session.desktop.in.in.h:1 msgid "GNOME on Wayland" -msgstr "GNOME sobre Wayland" +msgstr "GNOME em Wayland" #: ../data/gnome-wayland.desktop.in.h:2 msgid "This session logs you into GNOME, using Wayland" @@ -111,23 +54,23 @@ #: ../data/session-selector.ui.h:1 msgid "Custom Session" -msgstr "Sessão Personalizada" +msgstr "Sessão personalizada" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "Selecione uma sessão personalizada a executar" #: ../data/session-selector.ui.h:3 msgid "_New Session" -msgstr "_Nova Sessão" +msgstr "_Nova sessão" #: ../data/session-selector.ui.h:4 msgid "_Remove Session" -msgstr "_Remover Sessão" +msgstr "_Remover sessão" #: ../data/session-selector.ui.h:5 msgid "Rena_me Session" -msgstr "Reno_mear Sessão" +msgstr "Renomear _Sessão" #: ../data/session-selector.ui.h:6 msgid "_Continue" @@ -135,20 +78,20 @@ #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" -msgstr "A_plicações de arranque adicionais:" +msgstr "A_Plicações de arranque adicionais:" #: ../data/session-properties.ui.h:2 msgid "Startup Programs" -msgstr "Aplicações de Arranque" +msgstr "Aplicações de arranque" #: ../data/session-properties.ui.h:3 msgid "_Automatically remember running applications when logging out" msgstr "" -"Recordar _automaticamente as aplicações em execução ao terminar a sessão" +"Recordar _Automaticamente as aplicações em execução ao terminar a sessão" #: ../data/session-properties.ui.h:4 msgid "_Remember Currently Running Applications" -msgstr "_Recordar as Aplicações Atualmente em Execução" +msgstr "_Recordar as aplicações atualmente em execução" #: ../data/session-properties.ui.h:5 msgid "Options" @@ -160,91 +103,21 @@ #: ../data/session-properties.ui.h:7 msgid "Comm_ent:" -msgstr "Com_entário:" +msgstr "Com_Entário:" #: ../data/session-properties.ui.h:8 msgid "Co_mmand:" -msgstr "Co_mando:" +msgstr "Co_Mando:" #: ../data/session-properties.ui.h:9 msgid "_Name:" msgstr "_Nome:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Ficheiro não é um ficheiro .desktop válido" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Versão de ficheiro de ambiente de trabalho '%s' desconhecida" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "A iniciar %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Aplicação não aceita documentos na linha de comando" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Opção de iniciação desconhecida. %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"Incapaz de indicar URIs de documentos a uma entrada de ficheiro de ambiente " -"de trabalho 'Type=Link'" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "Não é um item iniciável" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "Desativar a ligação ao gestor de sessões" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "Especificar o ficheiro que contém a configuração gravada" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FICHEIRO" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "Especificar o ID de gestão de sessões" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "Opções de gestão de sessões:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "Apresentar as opções de gestão de sessões" - -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:313 msgid "Oh no! Something has gone wrong." msgstr "Ocorreu um erro inesperado." -#: ../gnome-session/gsm-fail-whale-dialog.c:302 +#: ../gnome-session/gsm-fail-whale-dialog.c:320 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -252,7 +125,7 @@ "Ocorreu um problema e o sistema é incapaz de recuperar. Contacte um " "administrador do sistema" -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:322 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -260,35 +133,35 @@ "Ocorreu um problema e o sistema é incapaz de recuperar. Por precaução, foram " "desativadas todas as extensões." -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:324 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." msgstr "" "Ocorreu um problema e o sistema é incapaz de recuperar.\n" -"Termine a sessão e tente novamente." +"Por favor, termine a sessão e tente novamente." -#: ../gnome-session/gsm-fail-whale-dialog.c:321 +#: ../gnome-session/gsm-fail-whale-dialog.c:339 msgid "_Log Out" -msgstr "_Terminar a Sessão" +msgstr "_Terminar a sessão" -#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 +#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:243 msgid "Enable debugging code" msgstr "Ativar o código de depuração" -#: ../gnome-session/gsm-fail-whale-dialog.c:344 +#: ../gnome-session/gsm-fail-whale-dialog.c:362 msgid "Allow logout" msgstr "Permitir terminar sessão" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 +#: ../gnome-session/gsm-fail-whale-dialog.c:363 msgid "Show extension warning" -msgstr "Apresentar aviso de extensão" +msgstr "Mostrar aviso de extensão" -#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 +#: ../gnome-session/gsm-manager.c:1251 ../gnome-session/gsm-manager.c:1896 msgid "Not responding" msgstr "Não está a responder" -#: ../gnome-session/gsm-util.c:411 +#: ../gnome-session/gsm-util.c:381 msgid "_Log out" msgstr "_Terminar a sessão" @@ -296,15 +169,15 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:559 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" -msgstr "Aplicação Recordada" +msgstr "Aplicação recordada" -#: ../gnome-session/gsm-xsmp-client.c:1209 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "Esta aplicação está a impedir o encerramento da sessão." -#: ../gnome-session/gsm-xsmp-server.c:341 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" @@ -312,41 +185,49 @@ "A recusar uma nova ligação cliente pois a sessão está atualmente a ser " "terminada\n" -#: ../gnome-session/gsm-xsmp-server.c:610 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" -msgstr "Incapaz de criar socket de escuta ICE: %s" +msgstr "Impossível criar socket de escuta ICE: %s" -#: ../gnome-session/main.c:305 +#: ../gnome-session/main.c:241 msgid "Override standard autostart directories" -msgstr "Especificar novos diretórios base de arranque automático" +msgstr "Especificar novas pastas base de arranque automático" -#: ../gnome-session/main.c:305 +#: ../gnome-session/main.c:241 msgid "AUTOSTART_DIR" -msgstr "DIR_INICIOAUTO" +msgstr "PASTA_INICIOAUTO" -#: ../gnome-session/main.c:306 +#: ../gnome-session/main.c:242 msgid "Session to use" msgstr "Sessão a utilizar" -#: ../gnome-session/main.c:306 +#: ../gnome-session/main.c:242 msgid "SESSION_NAME" msgstr "NOME_SESSAO" -#: ../gnome-session/main.c:308 +#: ../gnome-session/main.c:244 msgid "Do not load user-specified applications" -msgstr "Não ler as aplicações especificadas pelo utilizador" +msgstr "Não carregar as aplicações especificadas pelo utilizador" + +#: ../gnome-session/main.c:245 +msgid "Version of this application" +msgstr "Versão desta aplicação" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:311 +#: ../gnome-session/main.c:247 msgid "Show the fail whale dialog for testing" -msgstr "Apresentar o diálogo de falha total para teste" +msgstr "Mostrar o diálogo de falha total para teste" + +#: ../gnome-session/main.c:248 +msgid "Disable hardware acceleration check" +msgstr "Desativar teste de aceleração por hardware" -#: ../gnome-session/main.c:344 +#: ../gnome-session/main.c:267 msgid " - the GNOME session manager" msgstr " - o gestor de sessões do GNOME" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -368,9 +249,9 @@ "\n" "Executar COMANDO ao mesmo tempo que inibe alguma funcionalidade de sessão.\n" "\n" -" -h, --help Apresentar esta ajuda\n" -" --version Apresentar a versão da aplicação\n" -" --app-id ID O id de aplicação a utilizar\n" +" -h, --help Mostrar esta ajuda\n" +" --version Mostrar a versão da aplicação\n" +" --app-id ID A id de aplicação a usar\n" " ao inibir (opcional)\n" " --reason REASON O motivo para inibir (opcional)\n" " --inhibit ARG Funcionalidades a inibir, lista separada por vírgulas " @@ -378,72 +259,158 @@ " logout, switch-user, suspend, idle, automount\n" " --inhibit-only Não iniciar COMANDO e esperar indefinidamente\n" "\n" -"Se não for especificada nenhuma opção --inhibit, é assumida inatividade.\n" +"Se não for especificada nenhuma opção --inhibit, é assumida idle.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "Falha ao executar %s\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s requer um argumento\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format msgid "Session %d" msgstr "Sessão %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "" -"Não é permitido que o nome de uma sessão comece por ‘.’ ou contenha o " -"caracter ‘/’" +"Não é permitido que o nome de uma sessão comece por \".\" ou contenha o " +"carácter \"/\"" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" -msgstr "Não é permitido que o nome de uma sessão comece por ‘.’" +msgstr "Não é permitido que o nome de uma sessão comece por \".\"" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" -msgstr "Não é permitido que o nome de uma sessão contenha o caracter ‘/’" +msgstr "Não é permitido que o nome de uma sessão contenha o carácter \"/\"" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" -msgstr "Já existe uma sessão designada ‘%s’" +msgstr "Já existe uma sessão designada \"%s\"" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:49 msgid "Log out" msgstr "Terminar a sessão" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:50 msgid "Power off" msgstr "Desligar" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:51 msgid "Reboot" msgstr "Reiniciar" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:52 msgid "Ignoring any existing inhibitors" msgstr "A ignorar quaisquer inibidores existentes" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:53 msgid "Don't prompt for user confirmation" msgstr "Não pedir confirmação ao utilizador" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:87 ../tools/gnome-session-quit.c:101 msgid "Could not connect to the session manager" -msgstr "Não foi possível ligar-se ao gestor de sessões" +msgstr "Impossível ligar-se ao gestor de sessões" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:196 msgid "Program called with conflicting options" msgstr "Aplicação invocada com conflito de opções" +#~ msgid "Select Command" +#~ msgstr "Selecionar o Comando" + +#~ msgid "Add Startup Program" +#~ msgstr "Adicionar Aplicação de Arranque" + +#~ msgid "Edit Startup Program" +#~ msgstr "Editar Aplicação de Arranque" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "O comando de arranque não pode ser vazio" + +#~ msgid "The startup command is not valid" +#~ msgstr "O comando de arranque não é válido" + +#~ msgid "Enabled" +#~ msgstr "Ativo" + +#~ msgid "Icon" +#~ msgstr "Ícone" + +#~ msgid "Program" +#~ msgstr "Aplicação" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "Preferências das Aplicações de Arranque" + +#~ msgid "No name" +#~ msgstr "Sem nome" + +#~ msgid "No description" +#~ msgstr "Sem descrição" + +#~ msgid "Could not display help document" +#~ msgstr "Incapaz de apresentar o documento de ajuda" + +#~ msgid "Startup Applications" +#~ msgstr "Aplicações de Arranque" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "Selecione que aplicações arrancar ao iniciar uma sessão" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "Ficheiro não é um ficheiro .desktop válido" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "Versão de ficheiro de ambiente de trabalho '%s' desconhecida" + +#~ msgid "Starting %s" +#~ msgstr "A iniciar %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "Aplicação não aceita documentos na linha de comando" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Opção de iniciação desconhecida. %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "Incapaz de indicar URIs de documentos a uma entrada de ficheiro de " +#~ "ambiente de trabalho 'Type=Link'" + +#~ msgid "Not a launchable item" +#~ msgstr "Não é um item iniciável" + +#~ msgid "Disable connection to session manager" +#~ msgstr "Desativar a ligação ao gestor de sessões" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Especificar o ficheiro que contém a configuração gravada" + +#~ msgid "FILE" +#~ msgstr "FICHEIRO" + +#~ msgid "Specify session management ID" +#~ msgstr "Especificar o ID de gestão de sessões" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "Opções de gestão de sessões:" + +#~ msgid "Show session management options" +#~ msgstr "Apresentar as opções de gestão de sessões" + #~ msgid "Some programs are still running:" #~ msgstr "Algumas aplicações ainda se encontram em execução:" @@ -849,10 +816,11 @@ #~ "ports. This option will allow connections from (authorized) remote hosts. " #~ "gnome-session must be restarted for this to take effect." #~ msgstr "" -#~ "Por motivos de segurança, em plataformas que tenham _IceTcpTransNoListen" -#~ "() (sistemas XFree86), o gnome-session não escuta por ligações em portos " -#~ "TCP. Esta opção autorizará ligações de máquinas remotas (autorizadas). O " -#~ "gnome-session tem de ser reiniciado para que esta opção tenha efeito." +#~ "Por motivos de segurança, em plataformas que tenham " +#~ "_IceTcpTransNoListen() (sistemas XFree86), o gnome-session não escuta por " +#~ "ligações em portos TCP. Esta opção autorizará ligações de máquinas " +#~ "remotas (autorizadas). O gnome-session tem de ser reiniciado para que " +#~ "esta opção tenha efeito." #~ msgid "_Order:" #~ msgstr "_Ordem:" diff -Nru gnome-session-3.16.0/po/ro.po gnome-session-3.18.1.2/po/ro.po --- gnome-session-3.16.0/po/ro.po 2014-12-05 19:58:27.000000000 +0000 +++ gnome-session-3.18.1.2/po/ro.po 2015-09-16 17:18:35.000000000 +0000 @@ -3,81 +3,34 @@ # Adi Roiban https://launchpad.net/~adiroiban, 2008, 2009 # Lucian Adrian Grijincu , 2009, 2011. # Daniel Șerbănescu , 2010, 2011. +# Daniel Șerbănescu , 2015. msgid "" msgstr "" "Project-Id-Version: gnome-session-2.0\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-03-22 21:20+0000\n" -"PO-Revision-Date: 2011-03-23 01:25+0200\n" -"Last-Translator: Daniel Șerbănescu \n" -"Language-Team: Romanian Gnome Team \n" +"POT-Creation-Date: 2015-06-19 07:55+0000\n" +"PO-Revision-Date: 2015-06-22 17:30+0200\n" +"Last-Translator: Daniel Șerbănescu \n" +"Language-Team: Gnome Romanian Translation Team\n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" -"X-Generator: Virtaal 0.6.1\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: gnome\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "Alegere comandă" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "Adaugă un program de pornit" - -# LG: aici e vorba de titlul unei ferestre. -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "Editare program de pornit" - -#: ../capplet/gsm-app-dialog.c:485 -msgid "The startup command cannot be empty" -msgstr "Comanda de pornire nu poate fi nulă" - -#: ../capplet/gsm-app-dialog.c:491 -msgid "The startup command is not valid" -msgstr "Comanda de start nu este validă" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "Activat" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "Iconiță" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "Program" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "Preferințe aplicații la pornire" - -#: ../capplet/gsp-app.c:269 -msgid "No name" -msgstr "Fără nume" - -#: ../capplet/gsp-app.c:275 -msgid "No description" -msgstr "Fără descriere" - -#: ../capplet/main.c:35 ../gnome-session/main.c:280 -msgid "Version of this application" -msgstr "Versiunea acestei aplicații" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Personalizat" + +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Această opțiune vă permite să selectați o sesiune salvată" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "Nu se poate afișa documentul de ajutor" - -#: ../data/gnome-fallback.session.desktop.in.in.h:1 -msgid "GNOME fallback" -msgstr "Versiunea GNOME de rezervă" - -#: ../data/gnome.session.desktop.in.in.h:1 ../data/gnome.desktop.in.h:1 +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" msgstr "GNOME" @@ -85,254 +38,114 @@ msgid "This session logs you into GNOME" msgstr "Această sesiune vă va autentifica în GNOME" -#: ../data/gsm-inhibit-dialog.ui.h:1 -msgid "Some programs are still running:" -msgstr "O parte din programe sunt încă în funcțiune:" - -#: ../data/gsm-inhibit-dialog.ui.h:2 ../gnome-session/gsm-inhibit-dialog.c:644 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you " -"to lose work." -msgstr "" -"Se așteaptă terminarea programului. Întreruperea lui poate duce la pierderea " -"modificărilor efectuate." - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Choose what applications to start when you log in" -msgstr "Alegeți aplicațiile ce vor porni după ce vă autentificați" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Startup Applications" -msgstr "Aplicații pornite după autentificare" +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +#| msgid "GNOME" +msgid "GNOME dummy" +msgstr "machetă GNOME" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "GNOME pe Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Această sesiune vă va autentifica în GNOME, folosind Wayland" + +#: ../data/session-selector.ui.h:1 +#| msgid "Default session" +msgid "Custom Session" +msgstr "Sesiune personalizată" + +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 +msgid "Please select a custom session to run" +msgstr "Selectați o sesiune personalizată pentru rulare" + +#: ../data/session-selector.ui.h:3 +#| msgid "Save sessions" +msgid "_New Session" +msgstr "Sesiune _nouă" + +#: ../data/session-selector.ui.h:4 +#| msgid "Save sessions" +msgid "_Remove Session" +msgstr "_Elimină sesiunea" + +#: ../data/session-selector.ui.h:5 +#| msgid "Save sessions" +msgid "Rena_me Session" +msgstr "Redenu_mește sesiunea" + +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "_Continuă" #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" -msgstr "_Programe suplimentare de pornit:" +msgstr "_Programe la pornire adiționale:" #: ../data/session-properties.ui.h:2 -msgid "Browse…" -msgstr "Navighează…" +msgid "Startup Programs" +msgstr "Programe la pornire" #: ../data/session-properties.ui.h:3 -msgid "Co_mmand:" -msgstr "Co_mandă:" +msgid "_Automatically remember running applications when logging out" +msgstr "Memorează _automat aplicațiile ce rulează la ieșire" #: ../data/session-properties.ui.h:4 -msgid "Comm_ent:" -msgstr "Com_entariu:" +#| msgid "_Remember Currently Running Application" +msgid "_Remember Currently Running Applications" +msgstr "Memo_rează aplicațiile ce rulează în acest moment" #: ../data/session-properties.ui.h:5 msgid "Options" msgstr "Opțiuni" #: ../data/session-properties.ui.h:6 -msgid "Startup Programs" -msgstr "Programe de pornit" +msgid "Browse…" +msgstr "Navighează…" #: ../data/session-properties.ui.h:7 -msgid "_Automatically remember running applications when logging out" -msgstr "Memorează _automat la ieșire aplicațiile ce rulează" +msgid "Comm_ent:" +msgstr "Com_entariu:" #: ../data/session-properties.ui.h:8 -msgid "_Name:" -msgstr "_Nume:" +msgid "Co_mmand:" +msgstr "Co_mandă:" #: ../data/session-properties.ui.h:9 -msgid "_Remember Currently Running Application" -msgstr "Memo_rează aplicațiile ce rulează în acest moment" - -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Fișierul nu este un fișier .desktop valid" - -#: ../egg/eggdesktopfile.c:188 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Versiunea „%s” a fișierului desktop este nerecunoscută" - -#: ../egg/eggdesktopfile.c:958 -#, c-format -msgid "Starting %s" -msgstr "Se pornește %s" - -#: ../egg/eggdesktopfile.c:1100 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Aplicația nu acceptă documente în linia de comandă" - -#: ../egg/eggdesktopfile.c:1168 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Opțiune de lansare nerecunoscută: %d" - -#: ../egg/eggdesktopfile.c:1373 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"Nu s-a putut trimite URI-ul documentului unei intrări desktop „Type=Link”" - -#: ../egg/eggdesktopfile.c:1394 -#, c-format -msgid "Not a launchable item" -msgstr "Nu este un element lansabil" +msgid "_Name:" +msgstr "_Nume:" -#: ../egg/eggsmclient.c:225 -msgid "Disable connection to session manager" -msgstr "Dezactivează conexiunea la administratorul sesiunii" - -#: ../egg/eggsmclient.c:228 -msgid "Specify file containing saved configuration" -msgstr "Specifică fișierul ce conține configurația salvată" - -#: ../egg/eggsmclient.c:228 -msgid "FILE" -msgstr "FIȘIER" - -#: ../egg/eggsmclient.c:231 -msgid "Specify session management ID" -msgstr "Specifică ID-ul de administrare al sesiunii" - -#: ../egg/eggsmclient.c:231 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:252 -msgid "Session management options:" -msgstr "Opțiuni de administrare a sesiunii:" - -#: ../egg/eggsmclient.c:253 -msgid "Show session management options" -msgstr "Afișează opțiunile de administrare a sesiunii" +#: ../gnome-session/gsm-fail-whale-dialog.c:313 +msgid "Oh no! Something has gone wrong." +msgstr "Oh, nu! Ceva nu a funcționat corect." -#: ../gnome-session/gsm-gconf.c:106 -#, c-format +#: ../gnome-session/gsm-fail-whale-dialog.c:320 +#| msgid "" +#| "A problem has occurred and the system can't recover.\n" +#| "Please log out and try again." msgid "" -"There is a problem with the configuration server.\n" -"(%s exited with status %d)" +"A problem has occurred and the system can't recover. Please contact a system " +"administrator" msgstr "" -"Există o problemă cu serverul de configurare.\n" -"(%s a ieșit cu starea %d)" +"A intervenit o problemă și sistemul nu se poate recupera. Contactați un " +"administrator de sistem." -#: ../gnome-session/gsm-inhibit-dialog.c:253 -#, c-format -msgid "Icon '%s' not found" -msgstr "Iconița „%s” nu a fost găsită" - -#: ../gnome-session/gsm-inhibit-dialog.c:592 -msgid "Unknown" -msgstr "Necunoscut" - -#: ../gnome-session/gsm-inhibit-dialog.c:643 -msgid "A program is still running:" -msgstr "Un program este încă în funcțiune:" - -#: ../gnome-session/gsm-inhibit-dialog.c:647 -msgid "Some programs are still running:" -msgstr "Unele programe sunt încă în funcțiune:" - -#: ../gnome-session/gsm-inhibit-dialog.c:648 +#: ../gnome-session/gsm-fail-whale-dialog.c:322 +#| msgid "" +#| "A problem has occurred and the system can't recover.\n" +#| "Please log out and try again." msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you " -"to lose work." +"A problem has occurred and the system can't recover. All extensions have " +"been disabled as a precaution." msgstr "" -"Se așteaptă terminarea programelor. Întreruperea acestora poate duce la " -"pierderea modificărilor efectuate." - -#: ../gnome-session/gsm-inhibit-dialog.c:878 -msgid "Switch User Anyway" -msgstr "Schimbă oricum utilizatorul" - -#: ../gnome-session/gsm-inhibit-dialog.c:881 -msgid "Log Out Anyway" -msgstr "Închide sesiunea oricum" - -#: ../gnome-session/gsm-inhibit-dialog.c:884 -msgid "Suspend Anyway" -msgstr "Suspendă oricum" - -#: ../gnome-session/gsm-inhibit-dialog.c:887 -msgid "Hibernate Anyway" -msgstr "Hibernează oricum" - -#: ../gnome-session/gsm-inhibit-dialog.c:890 -msgid "Shut Down Anyway" -msgstr "Oprește oricum" - -#: ../gnome-session/gsm-inhibit-dialog.c:893 -msgid "Reboot Anyway" -msgstr "Repornește oricum" - -#: ../gnome-session/gsm-inhibit-dialog.c:901 -msgid "Lock Screen" -msgstr "Blochează ecranul" - -#: ../gnome-session/gsm-inhibit-dialog.c:904 -msgid "Cancel" -msgstr "Renunță" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:275 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Sesiunea se va închide automat într-o secundă." -msgstr[1] "Sesiunea se va închide automat în %d secunde." -msgstr[2] "Sesiunea se va închide automat în %d de secunde." - -#: ../gnome-session/gsm-logout-dialog.c:283 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Sistemul va fi oprit automat într-o secundă." -msgstr[1] "Sistemul va fi oprit automat în %d secunde." -msgstr[2] "Sistemul va fi oprit automat în %d de secunde." - -#: ../gnome-session/gsm-logout-dialog.c:315 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Sunteți autentificat ca „%s”." +"A intervenit o problemă și sistemul nu se poate recupera. Toate extensiile " +"au fost dezactivate preventiv." -#: ../gnome-session/gsm-logout-dialog.c:381 -msgid "Log out of this system now?" -msgstr "Ieșiți de pe acest sistem acum?" - -#: ../gnome-session/gsm-logout-dialog.c:387 -msgid "_Switch User" -msgstr "_Schimbă utilizatorul" - -#: ../gnome-session/gsm-logout-dialog.c:396 -#: ../gnome-session/gsm-fail-whale-dialog.c:296 -#: ../gnome-session/gsm-util.c:363 -msgid "_Log Out" -msgstr "_Ieșire din sesiune" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "Shut down this system now?" -msgstr "Opriți sistemul acum?" - -#: ../gnome-session/gsm-logout-dialog.c:408 -msgid "S_uspend" -msgstr "S_uspendă" - -#: ../gnome-session/gsm-logout-dialog.c:414 -msgid "_Hibernate" -msgstr "_Hibernează" - -#: ../gnome-session/gsm-logout-dialog.c:420 -msgid "_Restart" -msgstr "_Repornește" - -#: ../gnome-session/gsm-logout-dialog.c:430 -msgid "_Shut Down" -msgstr "_Oprește" - -#: ../gnome-session/gsm-fail-whale-dialog.c:276 -msgid "Oh no! Something has gone wrong." -msgstr "Oh, nu! Ceva nu a funcționat corect." - -#. make this changable at some point -#: ../gnome-session/gsm-fail-whale-dialog.c:283 +#: ../gnome-session/gsm-fail-whale-dialog.c:324 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -340,117 +153,407 @@ "A intervenit o problemă și sistemul nu se poate recupera.\n" "Ieșiți din sesiune și încercați din nou." -#: ../gnome-session/gsm-process-helper.c:123 -#, c-format -msgid "Exited with code %d" -msgstr "A ieșit cu codul %d" - -#: ../gnome-session/gsm-process-helper.c:128 -#, c-format -msgid "Killed by signal %d" -msgstr "Omorât de semnalul %d" - -#: ../gnome-session/gsm-process-helper.c:133 -#, c-format -msgid "Stopped by signal %d" -msgstr "Oprit de semnalul %d" - -#: ../gnome-session/gsm-manager.c:1362 -msgid "GNOME 3 Failed to Load" -msgstr "GNOME 3 nu a reușit să pornească" +#: ../gnome-session/gsm-fail-whale-dialog.c:339 +msgid "_Log Out" +msgstr "_Ieșire din sesiune" -#: ../gnome-session/gsm-manager.c:1363 -msgid "" -"Unfortunately GNOME 3 failed to start properly and started in the " -"fallback mode.\n" -"\n" -"This most likely means your system (graphics hardware or driver) is not " -"capable of delivering the full GNOME 3 experience." -msgstr "" -"Din păcate, GNOME 3 nu a reușit să pornească corect și a pornit versiunea " -"de rezervă.\n" -"\n" -"Cel mai probabil aceasta înseamnă că sistemul dumneavoastră (placa grafică " -"sau driverul acesteia) nu poate oferi o experiență GNOME 3 completă." +#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:243 +msgid "Enable debugging code" +msgstr "Activează codul pentru depanare" -#: ../gnome-session/gsm-manager.c:1365 -msgid "Learn more about GNOME 3" -msgstr "Aflați mai multe despre GNOME 3" +#: ../gnome-session/gsm-fail-whale-dialog.c:362 +#| msgid "Show logout dialog" +msgid "Allow logout" +msgstr "Permite ieșierea din sesiune" + +#: ../gnome-session/gsm-fail-whale-dialog.c:363 +msgid "Show extension warning" +msgstr "Afișează avertizările pentru extensii" -#: ../gnome-session/gsm-manager.c:1462 ../gnome-session/gsm-manager.c:2193 +#: ../gnome-session/gsm-manager.c:1251 ../gnome-session/gsm-manager.c:1896 msgid "Not responding" msgstr "Nu răspunde" -#: ../gnome-session/gsm-xsmp-client.c:1183 +#: ../gnome-session/gsm-util.c:381 +#| msgid "Log out" +msgid "_Log out" +msgstr "În_chide sesiunea" + +#. It'd be really surprising to reach this code: if we're here, +#. * then the XSMP client already has set several XSMP +#. * properties. But it could still be that SmProgram is not set. +#. +#: ../gnome-session/gsm-xsmp-client.c:557 +#| msgid "_Remember Currently Running Application" +msgid "Remembered Application" +msgstr "Aplicație memorată" + +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "Acest program blochează ieșirea din sesiune." -#: ../gnome-session/gsm-xsmp-server.c:325 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "Se refuză conexiunea noului client deoarece sesiunea este în curs de oprire\n" -#: ../gnome-session/gsm-xsmp-server.c:587 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" -msgstr "Nu s-a putut crea socket-ul de monitorizare ICE: %s" - -#. Oh well, no X for you! -#: ../gnome-session/gsm-util.c:347 -#, c-format -msgid "Unable to start login session (and unable to connect to the X server)" -msgstr "" -"Nu s-a putut porni sesiunea de start (iar conexiunea la serverul X nu a " -"putut fi realizată)" +msgstr "Nu s-a putut creea socketul de ascultare ICE: %s" -#: ../gnome-session/main.c:276 +#: ../gnome-session/main.c:241 msgid "Override standard autostart directories" -msgstr "Rescrie dosarele standard de pornire automată" +msgstr "Înlocuiește dosarele standard de pornire automată" + +#: ../gnome-session/main.c:241 +msgid "AUTOSTART_DIR" +msgstr "DIRECTOR_DE_PORNIRE" -#: ../gnome-session/main.c:277 +#: ../gnome-session/main.c:242 msgid "Session to use" msgstr "Sesiunea de utilizat" -#: ../gnome-session/main.c:278 -msgid "Enable debugging code" -msgstr "Activează codul pentru depanare" +#: ../gnome-session/main.c:242 +msgid "SESSION_NAME" +msgstr "NUMELE_SESIUNII" -#: ../gnome-session/main.c:279 +#: ../gnome-session/main.c:244 msgid "Do not load user-specified applications" msgstr "Nu încărca aplicațiile specificate de utilizator" -#: ../gnome-session/main.c:300 +#: ../gnome-session/main.c:245 +msgid "Version of this application" +msgstr "Versiunea acestei aplicații" + +#. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong +#: ../gnome-session/main.c:247 +msgid "Show the fail whale dialog for testing" +msgstr "Afișează dialogul de eroare pentru testare" + +#: ../gnome-session/main.c:248 +msgid "Disable hardware acceleration check" +msgstr "Dezactivează verificarea accelerării hardware" + +#: ../gnome-session/main.c:267 msgid " - the GNOME session manager" -msgstr " - Administrator de sesiune GNOME" +msgstr " - Administratorul de sesiune GNOME" -#: ../tools/gnome-session-quit.c:52 +#: ../tools/gnome-session-inhibit.c:108 +#, c-format +msgid "" +"%s [OPTION...] COMMAND\n" +"\n" +"Execute COMMAND while inhibiting some session functionality.\n" +"\n" +" -h, --help Show this help\n" +" --version Show program version\n" +" --app-id ID The application id to use\n" +" when inhibiting (optional)\n" +" --reason REASON The reason for inhibiting (optional)\n" +" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Do not launch COMMAND and wait forever instead\n" +"\n" +"If no --inhibit option is specified, idle is assumed.\n" +msgstr "" +"%s [OPȚIUNE...] COMANDĂ\n" +"\n" +"Execută COMANDA în timp ce interzic unele funcționalități ale sesiunii.\n" +"\n" +" -h, --help Arată acest ajutor\n" +" --version Arată versiunea programului\n" +" --app-id ID Identificatorul aplicației de folosit\n" +" când se interzice (opțional)\n" +" --reason REASON Motivul interzicerii (opțional)\n" +" --inhibit ARG Lucruri de interzis, listă separată prin punct și " +"virgulă:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Nu lansa COMANDA și așteaptă pentru totdeauna\n" +"\n" +"Dacă nicio opțiune --inhibit nu este specificată, se asumă idle.\n" + +#: ../tools/gnome-session-inhibit.c:146 +#, c-format +msgid "Failed to execute %s\n" +msgstr "Eroare la executarea %s\n" + +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s necesită un argument\n" + +#: ../tools/gnome-session-selector.c:61 +#, c-format +#| msgid "Session to use" +msgid "Session %d" +msgstr "Sesiunea %d" + +#: ../tools/gnome-session-selector.c:107 +msgid "" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "" +"Numele sesiunilor nu sunt permise să înceapă cu „.” sau să conțină caractere " +"„/”" + +#: ../tools/gnome-session-selector.c:111 +msgid "Session names are not allowed to start with ‘.’" +msgstr "Numele sesiunilor nu sunt permise să înceapă cu „.”" + +#: ../tools/gnome-session-selector.c:115 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "Numele sesiunilor nu sunt permise să conțină caractere „/”" + +#: ../tools/gnome-session-selector.c:123 +#, c-format +msgid "A session named ‘%s’ already exists" +msgstr "O sesiune numită „%s” există deja" + +#: ../tools/gnome-session-quit.c:49 msgid "Log out" msgstr "Închide sesiunea" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:50 msgid "Power off" msgstr "Oprire" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:51 +#| msgid "Reboot Anyway" +msgid "Reboot" +msgstr "Repornește" + +#: ../tools/gnome-session-quit.c:52 msgid "Ignoring any existing inhibitors" msgstr "Se ignoră orice inhibator existent" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Don't prompt for user confirmation" msgstr "Nu solicita confirmarea utilizatorului" -#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 +#: ../tools/gnome-session-quit.c:87 ../tools/gnome-session-quit.c:101 msgid "Could not connect to the session manager" msgstr "Nu s-a putut realiza conectarea la administratorul de sesiuni" -#: ../tools/gnome-session-quit.c:199 +#: ../tools/gnome-session-quit.c:196 msgid "Program called with conflicting options" msgstr "Program apelat cu opțiuni care intră în conflict" -#~ msgid "Default session" -#~ msgstr "Sesiune implicită" +#~ msgid "Select Command" +#~ msgstr "Alegere comandă" + +#~ msgid "Add Startup Program" +#~ msgstr "Adaugă un program de pornit" + +# LG: aici e vorba de titlul unei ferestre. +#~ msgid "Edit Startup Program" +#~ msgstr "Editare program de pornit" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "Comanda de pornire nu poate fi nulă" + +#~ msgid "The startup command is not valid" +#~ msgstr "Comanda de start nu este validă" + +#~ msgid "Enabled" +#~ msgstr "Activat" + +#~ msgid "Icon" +#~ msgstr "Iconiță" + +#~ msgid "Program" +#~ msgstr "Program" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "Preferințe aplicații la pornire" + +#~ msgid "No name" +#~ msgstr "Fără nume" + +#~ msgid "No description" +#~ msgstr "Fără descriere" + +#~ msgid "Could not display help document" +#~ msgstr "Nu se poate afișa documentul de ajutor" + +#~ msgid "Some programs are still running:" +#~ msgstr "O parte din programe sunt încă în funcțiune:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause " +#~ "you to lose work." +#~ msgstr "" +#~ "Se așteaptă terminarea programului. Întreruperea lui poate duce la " +#~ "pierderea modificărilor efectuate." + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "Alegeți aplicațiile ce vor porni după ce vă autentificați" + +#~ msgid "Startup Applications" +#~ msgstr "Aplicații pornite după autentificare" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "Fișierul nu este un fișier .desktop valid" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "Versiunea „%s” a fișierului desktop este nerecunoscută" + +#~ msgid "Starting %s" +#~ msgstr "Se pornește %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "Aplicația nu acceptă documente în linia de comandă" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Opțiune de lansare nerecunoscută: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "Nu s-a putut trimite URI-ul documentului unei intrări desktop „Type=Link”" + +#~ msgid "Not a launchable item" +#~ msgstr "Nu este un element lansabil" + +#~ msgid "Disable connection to session manager" +#~ msgstr "Dezactivează conexiunea la administratorul sesiunii" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Specifică fișierul ce conține configurația salvată" + +#~ msgid "FILE" +#~ msgstr "FIȘIER" + +#~ msgid "Specify session management ID" +#~ msgstr "Specifică ID-ul de administrare al sesiunii" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "Opțiuni de administrare a sesiunii:" + +#~ msgid "Show session management options" +#~ msgstr "Afișează opțiunile de administrare a sesiunii" + +#~ msgid "" +#~ "There is a problem with the configuration server.\n" +#~ "(%s exited with status %d)" +#~ msgstr "" +#~ "Există o problemă cu serverul de configurare.\n" +#~ "(%s a ieșit cu starea %d)" + +#~ msgid "Icon '%s' not found" +#~ msgstr "Iconița „%s” nu a fost găsită" + +#~ msgid "Unknown" +#~ msgstr "Necunoscut" + +#~ msgid "A program is still running:" +#~ msgstr "Un program este încă în funcțiune:" + +#~ msgid "Some programs are still running:" +#~ msgstr "Unele programe sunt încă în funcțiune:" + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause " +#~ "you to lose work." +#~ msgstr "" +#~ "Se așteaptă terminarea programelor. Întreruperea acestora poate duce la " +#~ "pierderea modificărilor efectuate." + +#~ msgid "Switch User Anyway" +#~ msgstr "Schimbă oricum utilizatorul" + +#~ msgid "Log Out Anyway" +#~ msgstr "Închide sesiunea oricum" + +#~ msgid "Suspend Anyway" +#~ msgstr "Suspendă oricum" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Hibernează oricum" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Oprește oricum" + +#~ msgid "Lock Screen" +#~ msgstr "Blochează ecranul" + +#~ msgid "Cancel" +#~ msgstr "Renunță" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Sesiunea se va închide automat într-o secundă." +#~ msgstr[1] "Sesiunea se va închide automat în %d secunde." +#~ msgstr[2] "Sesiunea se va închide automat în %d de secunde." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Sistemul va fi oprit automat într-o secundă." +#~ msgstr[1] "Sistemul va fi oprit automat în %d secunde." +#~ msgstr[2] "Sistemul va fi oprit automat în %d de secunde." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Sunteți autentificat ca „%s”." + +#~ msgid "Log out of this system now?" +#~ msgstr "Ieșiți de pe acest sistem acum?" + +#~ msgid "_Switch User" +#~ msgstr "_Schimbă utilizatorul" + +#~ msgid "Shut down this system now?" +#~ msgstr "Opriți sistemul acum?" + +#~ msgid "S_uspend" +#~ msgstr "S_uspendă" + +#~ msgid "_Hibernate" +#~ msgstr "_Hibernează" + +#~ msgid "_Restart" +#~ msgstr "_Repornește" + +#~ msgid "_Shut Down" +#~ msgstr "_Oprește" + +#~ msgid "Exited with code %d" +#~ msgstr "A ieșit cu codul %d" + +#~ msgid "Killed by signal %d" +#~ msgstr "Omorât de semnalul %d" + +#~ msgid "Stopped by signal %d" +#~ msgstr "Oprit de semnalul %d" + +#~ msgid "GNOME 3 Failed to Load" +#~ msgstr "GNOME 3 nu a reușit să pornească" + +#~ msgid "" +#~ "Unfortunately GNOME 3 failed to start properly and started in the " +#~ "fallback mode.\n" +#~ "\n" +#~ "This most likely means your system (graphics hardware or driver) is not " +#~ "capable of delivering the full GNOME 3 experience." +#~ msgstr "" +#~ "Din păcate, GNOME 3 nu a reușit să pornească corect și a pornit versiunea " +#~ "de rezervă.\n" +#~ "\n" +#~ "Cel mai probabil aceasta înseamnă că sistemul dumneavoastră (placa " +#~ "grafică sau driverul acesteia) nu poate oferi o experiență GNOME 3 " +#~ "completă." + +#~ msgid "Learn more about GNOME 3" +#~ msgstr "Aflați mai multe despre GNOME 3" + +#~ msgid "" +#~ "Unable to start login session (and unable to connect to the X server)" +#~ msgstr "" +#~ "Nu s-a putut porni sesiunea de start (iar conexiunea la serverul X nu a " +#~ "putut fi realizată)" #~ msgid "File Manager" #~ msgstr "Administrator de fișiere" @@ -491,9 +594,6 @@ #~ msgid "Required session components" #~ msgstr "Componentele necesare sesiunii" -#~ msgid "Save sessions" -#~ msgstr "Salvează sesiunile" - #~ msgid "" #~ "The file manager provides the desktop icons and allows you to interact " #~ "with your saved files." @@ -531,9 +631,6 @@ #~ msgid "GConf key used to look up default session" #~ msgstr "Cheia GConf folosită la căutarea sesiunii implicite" -#~ msgid "Show logout dialog" -#~ msgstr "Afișează dialogul de ieșire din sesiune" - #~ msgid "Show shutdown dialog" #~ msgstr "Afișează dialogul de oprire" diff -Nru gnome-session-3.16.0/po/th.po gnome-session-3.18.1.2/po/th.po --- gnome-session-3.16.0/po/th.po 2014-12-05 19:58:27.000000000 +0000 +++ gnome-session-3.18.1.2/po/th.po 2015-09-16 17:18:35.000000000 +0000 @@ -1,83 +1,37 @@ # Thai translation for gnome-session. -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This file is distributed under the same license as the gnome-session package. # # Ranee Somchaimit , 2003 # Paisa Seeluangsawat , 2004 # Theppitak Karoonboonyanan , 2005-2012 +# Akom Chotiphantawanon , 2015. # msgid "" msgstr "" "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-07-17 02:00+0000\n" -"PO-Revision-Date: 2012-09-06 20:17+0700\n" -"Last-Translator: Theppitak Karoonboonyanan \n" +"POT-Creation-Date: 2015-04-15 08:01+0000\n" +"PO-Revision-Date: 2015-04-15 17:02+0700\n" +"Last-Translator: Akom Chotiphantawanon \n" "Language-Team: Thai \n" "Language: th\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" +"X-Generator: Gtranslator 2.91.6\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "เลือกคำสั่ง" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "เพิ่มโปรแกรมเริ่มวาระ" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "แก้ไขโปรแกรมเริ่มวาระ" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "คำสั่งที่ให้เรียกเมื่อเริ่มวาระจะว่างไม่ได้" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "คำสั่งที่ให้เรียกเมื่อเริ่มวาระผิดพลาด" - -#: ../capplet/gsm-properties-dialog.c:518 -msgid "Enabled" -msgstr "เปิดใช้" - -#: ../capplet/gsm-properties-dialog.c:530 -msgid "Icon" -msgstr "ไอคอน" - -#: ../capplet/gsm-properties-dialog.c:542 -msgid "Program" -msgstr "โปรแกรม" - -#: ../capplet/gsm-properties-dialog.c:746 -msgid "Startup Applications Preferences" -msgstr "ปรับแต่งโปรแกรมเริ่มวาระ" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "ไม่มีชื่อ" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "ไม่มีคำบรรยาย" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "กำหนดเอง" -#: ../capplet/main.c:35 ../gnome-session/main.c:294 -msgid "Version of this application" -msgstr "รุ่นของโปรแกรมนี้" - -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "ไม่สามารถแสดงเอกสารวิธีใช้" - -#: ../data/gnome-fallback.session.desktop.in.in.h:1 -msgid "GNOME fallback" -msgstr "GNOME แบบสำรอง" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "รายการนี้จะให้คุณเลือกวาระที่บันทึกไว้" -#: ../data/gnome.session.desktop.in.in.h:1 ../data/gnome.desktop.in.h:1 +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" msgstr "GNOME" @@ -85,23 +39,42 @@ msgid "This session logs you into GNOME" msgstr "วาระนี้จะเข้าสู่ GNOME" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:643 -msgid "Some programs are still running:" -msgstr "ยังมีบางโปรแกรมทำงานอยู่:" - -#: ../data/gsm-inhibit-dialog.ui.h:2 ../gnome-session/gsm-inhibit-dialog.c:640 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you " -"to lose work." -msgstr "จะรอให้โปรแกรมนี้ทำงานจบ การขัดจังหวะโปรแกรมอาจทำให้สูญเสียงานบางอย่างของคุณไป" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "โปรแกรมเริ่มวาระ" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "เลือกโปรแกรมที่จะเปิดเมื่อคุณเข้าระบบ" +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +msgid "GNOME dummy" +msgstr "หุ่นตัวอย่าง GNOME" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME ใน Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "วาระนี้จะเข้าสู่ GNOME โดยใช้ Wayland" + +#: ../data/session-selector.ui.h:1 +msgid "Custom Session" +msgstr "วาระที่กำหนดเอง" + +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 +msgid "Please select a custom session to run" +msgstr "กรุณาเลือกวาระที่กำหนดเองที่จะเรียกทำงาน" + +#: ../data/session-selector.ui.h:3 +msgid "_New Session" +msgstr "วาระใ_หม่" + +#: ../data/session-selector.ui.h:4 +msgid "_Remove Session" +msgstr "_ลบวาระ" + +#: ../data/session-selector.ui.h:5 +msgid "Rena_me Session" +msgstr "เ_ปลี่ยนชื่อวาระ" + +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "เข้าระบบ_ต่อไป" #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" @@ -139,199 +112,17 @@ msgid "_Name:" msgstr "_ชื่อ:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "แฟ้มนี้ไม่ใช่แฟ้ม .desktop ที่ใช้ได้" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "ไม่รู้จักแฟ้มเดสก์ท็อปรุ่น '%s'" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "กำลังเริ่ม %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "โปรแกรมไม่รับเอกสารในบรรทัดคำสั่ง" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "ไม่รู้จักตัวเลือกของการเรียกโปรแกรม: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "ไม่สามารถส่ง URI ของเอกสารไปยังรายการเดสก์ท็อปที่มี 'Type=Link'" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "ไม่ใช่รายการที่เรียกทำงานได้" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "ปิดใช้การเชื่อมต่อไปยังโปรแกรมจัดการวาระ" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "ระบุแฟ้มที่บันทึกค่าตั้งไว้" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FILE" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "ระบุหมายเลขการจัดการวาระ" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "ตัวเลือกเกี่ยวกับการจัดการวาระ:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "แสดงตัวเลือกเกี่ยวกับการจัดการวาระ" - -#: ../gnome-session/gsm-inhibit-dialog.c:253 -#, c-format -msgid "Icon '%s' not found" -msgstr "ไม่พบไอคอน '%s'" - -#: ../gnome-session/gsm-inhibit-dialog.c:588 -msgid "Unknown" -msgstr "ไม่ทราบ" - -#: ../gnome-session/gsm-inhibit-dialog.c:639 -msgid "A program is still running:" -msgstr "มีโปรแกรมที่ยังทำงานอยู่:" - -#: ../gnome-session/gsm-inhibit-dialog.c:644 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you " -"to lose work." -msgstr "จะรอให้โปรแกรมเหล่านี้ทำงานจบ การขัดจังหวะโปรแกรมอาจทำให้เสียงานบางอย่างของคุณไป" - -#: ../gnome-session/gsm-inhibit-dialog.c:874 -msgid "Switch User Anyway" -msgstr "ยืนยันการสลับผู้ใช้" - -#: ../gnome-session/gsm-inhibit-dialog.c:877 -msgid "Log Out Anyway" -msgstr "ยืนยันการออกจากระบบ" - -#: ../gnome-session/gsm-inhibit-dialog.c:880 -msgid "Suspend Anyway" -msgstr "ยืนยันการพักเครื่อง" - -#: ../gnome-session/gsm-inhibit-dialog.c:883 -msgid "Hibernate Anyway" -msgstr "ยืนยันการจำศีลเครื่อง" - -#: ../gnome-session/gsm-inhibit-dialog.c:886 -msgid "Shut Down Anyway" -msgstr "ยืนยันการปิดเครื่อง" - -#: ../gnome-session/gsm-inhibit-dialog.c:889 -msgid "Restart Anyway" -msgstr "ยืนยันการเปิดเครื่องใหม่" - -#: ../gnome-session/gsm-inhibit-dialog.c:897 -msgid "Lock Screen" -msgstr "ล็อคหน้าจอ" - -#: ../gnome-session/gsm-inhibit-dialog.c:900 -msgid "Cancel" -msgstr "ยกเลิก" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:266 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "คุณจะออกจากระบบโดยอัตโนมัติภายใน %d วินาที" - -#: ../gnome-session/gsm-logout-dialog.c:274 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "ระบบจะปิดโดยอัตโนมัติภายใน %d วินาที" - -#: ../gnome-session/gsm-logout-dialog.c:282 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "ระบบจะเริ่มเปิดใหม่โดยอัตโนมัติภายใน %d วินาที" - -#: ../gnome-session/gsm-logout-dialog.c:306 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "คุณกำลังเข้าระบบในนาม \"%s\"" - -#: ../gnome-session/gsm-logout-dialog.c:372 -msgid "Log out of this system now?" -msgstr "ออกจากระบบเดี๋ยวนี้เลยหรือไม่?" - -#: ../gnome-session/gsm-logout-dialog.c:378 -msgid "_Switch User" -msgstr "_สลับผู้ใช้" - -#: ../gnome-session/gsm-logout-dialog.c:387 -#: ../gnome-session/gsm-fail-whale-dialog.c:337 -#: ../gnome-session/gsm-util.c:389 -msgid "_Log Out" -msgstr "_ออกจากระบบ" - -#: ../gnome-session/gsm-logout-dialog.c:393 -msgid "Shut down this system now?" -msgstr "ปิดเครื่องเดี๋ยวนี้เลยหรือไม่?" - -#: ../gnome-session/gsm-logout-dialog.c:399 -msgid "S_uspend" -msgstr "_พักเครื่อง" - -#: ../gnome-session/gsm-logout-dialog.c:405 -msgid "_Hibernate" -msgstr "_จำศีลเครื่อง" - -#: ../gnome-session/gsm-logout-dialog.c:411 -#: ../gnome-session/gsm-logout-dialog.c:437 -msgid "_Restart" -msgstr "_เปิดเครื่องใหม่" - -#: ../gnome-session/gsm-logout-dialog.c:421 -msgid "_Shut Down" -msgstr "ปิ_ดเครื่อง" - -#: ../gnome-session/gsm-logout-dialog.c:427 -msgid "Restart this system now?" -msgstr "เริ่มเปิดเครื่องใหม่เดี๋ยวนี้เลยหรือไม่?" - -#: ../gnome-session/gsm-fail-whale-dialog.c:311 +#: ../gnome-session/gsm-fail-whale-dialog.c:313 msgid "Oh no! Something has gone wrong." msgstr "คุณพระ! มีอะไรผิดพลาดสักอย่าง" -#: ../gnome-session/gsm-fail-whale-dialog.c:318 +#: ../gnome-session/gsm-fail-whale-dialog.c:320 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" msgstr "เกิดปัญหาบางอย่างขึ้น โดยระบบไม่สามารถฟื้นคืนได้ กรุณาติดต่อผู้ดูแลระบบ" -#: ../gnome-session/gsm-fail-whale-dialog.c:320 +#: ../gnome-session/gsm-fail-whale-dialog.c:322 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -339,7 +130,7 @@ "เกิดปัญหาบางอย่างขึ้น โดยระบบไม่สามารถฟื้นคืนได้ " "ระบบได้ปิดการใช้ส่วนขยายทั้งหมดเพื่อเป็นการป้องกันแล้ว" -#: ../gnome-session/gsm-fail-whale-dialog.c:322 +#: ../gnome-session/gsm-fail-whale-dialog.c:324 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -347,121 +138,378 @@ "เกิดปัญหาบางอย่างขึ้น โดยระบบไม่สามารถฟื้นคืนได้\n" "กรุณาออกจากระบบ แล้วลองเข้ามาใหม่" -#: ../gnome-session/gsm-manager.c:1393 -msgid "GNOME 3 Failed to Load" -msgstr "GNOME 3 โหลดไม่สำเร็จ" +#: ../gnome-session/gsm-fail-whale-dialog.c:339 +msgid "_Log Out" +msgstr "_ออกจากระบบ" -#: ../gnome-session/gsm-manager.c:1394 -msgid "" -"Unfortunately GNOME 3 failed to start properly and started in the " -"fallback mode.\n" -"\n" -"This most likely means your system (graphics hardware or driver) is not " -"capable of delivering the full GNOME 3 experience." -msgstr "" -"โชคไม่ดีที่ GNOME 3 เริ่มทำงานไม่สำเร็จ โดยเป็นการทำงานใน โหมดสำรอง\n" -"\n" -"เป็นไปได้สูงว่าระบบของคุณ (การ์ดจอหรือไดรเวอร์) ไม่สามารถรองรับการทำงานของ GNOME 3 " -"อย่างเต็มรูปแบบได้" +#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:243 +msgid "Enable debugging code" +msgstr "เปิดใช้โค้ดส่วนดีบั๊ก" -#: ../gnome-session/gsm-manager.c:1396 -msgid "Learn more about GNOME 3" -msgstr "ศึกษาเพิ่มเติมเกี่ยวกับ GNOME 3" +#: ../gnome-session/gsm-fail-whale-dialog.c:362 +msgid "Allow logout" +msgstr "อนุญาตให้ออกจากระบบ" + +#: ../gnome-session/gsm-fail-whale-dialog.c:363 +msgid "Show extension warning" +msgstr "แสดงคำเตือนของส่วนขยาย" -#: ../gnome-session/gsm-manager.c:1493 ../gnome-session/gsm-manager.c:2234 +#: ../gnome-session/gsm-manager.c:1251 ../gnome-session/gsm-manager.c:1896 msgid "Not responding" msgstr "ไม่ตอบสนอง" +#: ../gnome-session/gsm-util.c:381 +msgid "_Log out" +msgstr "_ออกจากระบบ" + #. It'd be really surprising to reach this code: if we're here, #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:559 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "โปรแกรมที่จำไว้" -#: ../gnome-session/gsm-xsmp-client.c:1197 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "โปรแกรมนี้ขัดขวางการออกจากระบบอยู่" -#: ../gnome-session/gsm-xsmp-server.c:326 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "ไม่รับการเชื่อมต่อใหม่จากลูกข่าย เพราะวาระกำลังปิดตัว\n" -#: ../gnome-session/gsm-xsmp-server.c:595 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ไม่สามารถสร้างซ็อกเก็ตรอรับการเชื่อมต่อ ICE: %s" -#. Oh well, no X for you! -#: ../gnome-session/gsm-util.c:373 -#, c-format -msgid "Unable to start login session (and unable to connect to the X server)" -msgstr "ไม่สามารถเริ่มวาระเข้าระบบ (และไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์เอ็กซ์)" - -#: ../gnome-session/main.c:290 +#: ../gnome-session/main.c:241 msgid "Override standard autostart directories" msgstr "กำหนดค่าไดเรกทอรีเริ่มต้นอัตโนมัติทับค่ามาตรฐาน" -#: ../gnome-session/main.c:290 +#: ../gnome-session/main.c:241 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:291 +#: ../gnome-session/main.c:242 msgid "Session to use" msgstr "วาระที่จะใช้" -#: ../gnome-session/main.c:291 +#: ../gnome-session/main.c:242 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:292 -msgid "Enable debugging code" -msgstr "เปิดใช้โค้ดส่วนดีบั๊ก" - -#: ../gnome-session/main.c:293 +#: ../gnome-session/main.c:244 msgid "Do not load user-specified applications" msgstr "ไม่ต้องโหลดโปรแกรมที่ผู้ใช้ระบุไว้" +#: ../gnome-session/main.c:245 +msgid "Version of this application" +msgstr "รุ่นของโปรแกรมนี้" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:296 +#: ../gnome-session/main.c:247 msgid "Show the fail whale dialog for testing" msgstr "แสดงกล่องแจ้งพังเพื่อทดสอบ" -#: ../gnome-session/main.c:316 +#: ../gnome-session/main.c:248 +msgid "Disable hardware acceleration check" +msgstr "ปิดใช้การตรวจสอบการเร่งความเร็วด้วยฮาร์ดแวร์" + +#: ../gnome-session/main.c:267 msgid " - the GNOME session manager" msgstr "- โปรแกรมจัดการวาระ GNOME" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-inhibit.c:108 +#, c-format +msgid "" +"%s [OPTION...] COMMAND\n" +"\n" +"Execute COMMAND while inhibiting some session functionality.\n" +"\n" +" -h, --help Show this help\n" +" --version Show program version\n" +" --app-id ID The application id to use\n" +" when inhibiting (optional)\n" +" --reason REASON The reason for inhibiting (optional)\n" +" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Do not launch COMMAND and wait forever instead\n" +"\n" +"If no --inhibit option is specified, idle is assumed.\n" +msgstr "" +"%s [ตัวเลือก...] คำสั่ง\n" +"\n" +"เรียก \"คำสั่ง\" ขณะระงับการทำงานบางส่วนของวาระ\n" +"\n" +" -h, --help แสดงวิธีใช้นี้\n" +" --version แสดงรุ่นของโปรแกรม\n" +" --app-id ID ID ของโปรแกรมที่ใช้\n" +" เมื่อจะระงับ (ระบุหรือไม่ก็ได้)\n" +" --reason REASON เหตุผลของการระงับ (ระบุหรือไม่ก็ได้)\n" +" --inhibit ARG สิ่งที่จะระงับ, เป็นรายชื่อที่คั่นด้วยทวิภาคของ:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only ไม่ต้องเรียก \"คำสั่ง\" และหยุดรอแทน\n" +"\n" +"ถ้าไม่ระบุตัวเลือก --inhibit จะถือเป็นการเดินเครื่องเปล่า\n" + +#: ../tools/gnome-session-inhibit.c:146 +#, c-format +msgid "Failed to execute %s\n" +msgstr "เรียกทำงาน %s ไม่สำเร็จ\n" + +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s ต้องมีอาร์กิวเมนต์\n" + +#: ../tools/gnome-session-selector.c:61 +#, c-format +msgid "Session %d" +msgstr "วาระ %d" + +#: ../tools/gnome-session-selector.c:107 +msgid "" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "ชื่อวาระห้ามขึ้นต้นด้วย ‘.’ หรือมีอักขระ ‘/’" + +#: ../tools/gnome-session-selector.c:111 +msgid "Session names are not allowed to start with ‘.’" +msgstr "ชื่อวาระห้ามขึ้นต้นด้วย ‘.’" + +#: ../tools/gnome-session-selector.c:115 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "ชื่อวาระห้ามมีอักขระ ‘/’" + +#: ../tools/gnome-session-selector.c:123 +#, c-format +msgid "A session named ‘%s’ already exists" +msgstr "มีวาระชื่อ ‘%s’ อยู่ก่อนแล้ว" + +#: ../tools/gnome-session-quit.c:49 msgid "Log out" msgstr "ออกจากระบบ" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:50 msgid "Power off" msgstr "ปิดเครื่อง" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:51 msgid "Reboot" msgstr "เริ่มเปิดเครื่องใหม่" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:52 msgid "Ignoring any existing inhibitors" msgstr "ไม่สนใจการระงับต่างๆ ที่มีอยู่" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:53 msgid "Don't prompt for user confirmation" msgstr "ไม่ต้องถามการยืนยันจากผู้ใช้" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:87 ../tools/gnome-session-quit.c:101 msgid "Could not connect to the session manager" msgstr "ติดต่อโปรแกรมจัดการวาระไม่สำเร็จ" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:196 msgid "Program called with conflicting options" msgstr "โปรแกรมถูกเรียกด้วยตัวเลือกที่ขัดแย้งกันเอง" +#~ msgid "Select Command" +#~ msgstr "เลือกคำสั่ง" + +#~ msgid "Add Startup Program" +#~ msgstr "เพิ่มโปรแกรมเริ่มวาระ" + +#~ msgid "Edit Startup Program" +#~ msgstr "แก้ไขโปรแกรมเริ่มวาระ" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "คำสั่งที่ให้เรียกเมื่อเริ่มวาระจะว่างไม่ได้" + +#~ msgid "The startup command is not valid" +#~ msgstr "คำสั่งที่ให้เรียกเมื่อเริ่มวาระผิดพลาด" + +#~ msgid "Enabled" +#~ msgstr "เปิดใช้" + +#~ msgid "Icon" +#~ msgstr "ไอคอน" + +#~ msgid "Program" +#~ msgstr "โปรแกรม" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "ปรับแต่งโปรแกรมเริ่มวาระ" + +#~ msgid "No name" +#~ msgstr "ไม่มีชื่อ" + +#~ msgid "No description" +#~ msgstr "ไม่มีคำบรรยาย" + +#~ msgid "Could not display help document" +#~ msgstr "ไม่สามารถแสดงเอกสารวิธีใช้" + +#~ msgid "Some programs are still running:" +#~ msgstr "ยังมีบางโปรแกรมทำงานอยู่:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause " +#~ "you to lose work." +#~ msgstr "" +#~ "จะรอให้โปรแกรมนี้ทำงานจบ การขัดจังหวะโปรแกรมอาจทำให้สูญเสียงานบางอย่างของคุณไป" + +#~ msgid "Startup Applications" +#~ msgstr "โปรแกรมเริ่มวาระ" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "เลือกโปรแกรมที่จะเปิดเมื่อคุณเข้าระบบ" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "แฟ้มนี้ไม่ใช่แฟ้ม .desktop ที่ใช้ได้" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "ไม่รู้จักแฟ้มเดสก์ท็อปรุ่น '%s'" + +#~ msgid "Starting %s" +#~ msgstr "กำลังเริ่ม %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "โปรแกรมไม่รับเอกสารในบรรทัดคำสั่ง" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "ไม่รู้จักตัวเลือกของการเรียกโปรแกรม: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "ไม่สามารถส่ง URI ของเอกสารไปยังรายการเดสก์ท็อปที่มี 'Type=Link'" + +#~ msgid "Not a launchable item" +#~ msgstr "ไม่ใช่รายการที่เรียกทำงานได้" + +#~ msgid "Disable connection to session manager" +#~ msgstr "ปิดใช้การเชื่อมต่อไปยังโปรแกรมจัดการวาระ" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "ระบุแฟ้มที่บันทึกค่าตั้งไว้" + +#~ msgid "FILE" +#~ msgstr "FILE" + +#~ msgid "Specify session management ID" +#~ msgstr "ระบุหมายเลขการจัดการวาระ" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "ตัวเลือกเกี่ยวกับการจัดการวาระ:" + +#~ msgid "Show session management options" +#~ msgstr "แสดงตัวเลือกเกี่ยวกับการจัดการวาระ" + +#~ msgid "Icon '%s' not found" +#~ msgstr "ไม่พบไอคอน '%s'" + +#~ msgid "Unknown" +#~ msgstr "ไม่ทราบ" + +#~ msgid "A program is still running:" +#~ msgstr "มีโปรแกรมที่ยังทำงานอยู่:" + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause " +#~ "you to lose work." +#~ msgstr "" +#~ "จะรอให้โปรแกรมเหล่านี้ทำงานจบ การขัดจังหวะโปรแกรมอาจทำให้เสียงานบางอย่างของคุณไป" + +#~ msgid "Switch User Anyway" +#~ msgstr "ยืนยันการสลับผู้ใช้" + +#~ msgid "Log Out Anyway" +#~ msgstr "ยืนยันการออกจากระบบ" + +#~ msgid "Suspend Anyway" +#~ msgstr "ยืนยันการพักเครื่อง" + +#~ msgid "Hibernate Anyway" +#~ msgstr "ยืนยันการจำศีลเครื่อง" + +#~ msgid "Shut Down Anyway" +#~ msgstr "ยืนยันการปิดเครื่อง" + +#~ msgid "Restart Anyway" +#~ msgstr "ยืนยันการเปิดเครื่องใหม่" + +#~ msgid "Lock Screen" +#~ msgstr "ล็อคหน้าจอ" + +#~ msgid "Cancel" +#~ msgstr "ยกเลิก" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "คุณจะออกจากระบบโดยอัตโนมัติภายใน %d วินาที" + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "ระบบจะปิดโดยอัตโนมัติภายใน %d วินาที" + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "ระบบจะเริ่มเปิดใหม่โดยอัตโนมัติภายใน %d วินาที" + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "คุณกำลังเข้าระบบในนาม \"%s\"" + +#~ msgid "Log out of this system now?" +#~ msgstr "ออกจากระบบเดี๋ยวนี้เลยหรือไม่?" + +#~ msgid "_Switch User" +#~ msgstr "_สลับผู้ใช้" + +#~ msgid "Shut down this system now?" +#~ msgstr "ปิดเครื่องเดี๋ยวนี้เลยหรือไม่?" + +#~ msgid "S_uspend" +#~ msgstr "_พักเครื่อง" + +#~ msgid "_Hibernate" +#~ msgstr "_จำศีลเครื่อง" + +#~ msgid "_Restart" +#~ msgstr "_เปิดเครื่องใหม่" + +#~ msgid "_Shut Down" +#~ msgstr "ปิ_ดเครื่อง" + +#~ msgid "Restart this system now?" +#~ msgstr "เริ่มเปิดเครื่องใหม่เดี๋ยวนี้เลยหรือไม่?" + +#~ msgid "GNOME 3 Failed to Load" +#~ msgstr "GNOME 3 โหลดไม่สำเร็จ" + +#~ msgid "" +#~ "Unfortunately GNOME 3 failed to start properly and started in the " +#~ "fallback mode.\n" +#~ "\n" +#~ "This most likely means your system (graphics hardware or driver) is not " +#~ "capable of delivering the full GNOME 3 experience." +#~ msgstr "" +#~ "โชคไม่ดีที่ GNOME 3 เริ่มทำงานไม่สำเร็จ โดยเป็นการทำงานใน โหมดสำรอง\n" +#~ "\n" +#~ "เป็นไปได้สูงว่าระบบของคุณ (การ์ดจอหรือไดรเวอร์) ไม่สามารถรองรับการทำงานของ GNOME 3 " +#~ "อย่างเต็มรูปแบบได้" + +#~ msgid "Learn more about GNOME 3" +#~ msgstr "ศึกษาเพิ่มเติมเกี่ยวกับ GNOME 3" + +#~ msgid "" +#~ "Unable to start login session (and unable to connect to the X server)" +#~ msgstr "ไม่สามารถเริ่มวาระเข้าระบบ (และไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์เอ็กซ์)" + #~ msgid "Some programs are still running:" #~ msgstr "ยังมีบางโปรแกรมทำงานอยู่:" @@ -528,9 +576,6 @@ #~ msgid "Required session components" #~ msgstr "องค์ประกอบที่จำเป็นของวาระ" -#~ msgid "Save sessions" -#~ msgstr "บันทึกรายละเอียดวาระ" - #~ msgid "" #~ "The file manager provides the desktop icons and allows you to interact " #~ "with your saved files." @@ -863,9 +908,6 @@ #~ "การเข้าวาระในฐานะผู้ใช้อภิสิทธิ์เป็นสิ่งที่ควรหลีกเลี่ยง ด้วยเหตุผลเรื่องการรักษาความปลอดภัย " #~ "ถ้าเป็นไปได้ คุณควรเข้าระบบในนามผู้ใช้ปกติแทน" -#~ msgid "_Continue" -#~ msgstr "เข้าระบบ_ต่อไป" - #~ msgid "" #~ "The session might encounter issues if the computer clock is not properly " #~ "configured. Please consider adjusting it.\n" @@ -931,9 +973,6 @@ #~ msgid "_Close without Saving" #~ msgstr "_ปิดโดยไม่บันทึก" -#~ msgid "Current Session" -#~ msgstr "วาระปัจจุบัน" - #~ msgid "Your session has been saved." #~ msgstr "บันทึกวาระของคุณเรียบร้อย" @@ -979,9 +1018,6 @@ #~ msgid "The session name cannot be empty" #~ msgstr "ชื่อวาระจะว่างไม่ได้" -#~ msgid "The session name already exists" -#~ msgstr "มีวาระชื่อนี้อยู่แล้ว" - #~ msgid "Add a new session" #~ msgstr "เพิ่มวาระใหม่" @@ -1004,12 +1040,6 @@ #~ msgid "Show splash screen on _login" #~ msgstr "แ_สดงรูปขณะกำลังเข้าสู่ระบบ" -#~ msgid "As_k on logout" -#~ msgstr "_ถามก่อนออกจากระบบ" - -#~ msgid "_Sessions:" -#~ msgstr "วา_ระ" - #~ msgid "_Startup Command:" #~ msgstr "_คำสั่งเรียกเมื่อเริ่มวาระ:" diff -Nru gnome-session-3.16.0/tools/Makefile.in gnome-session-3.18.1.2/tools/Makefile.in --- gnome-session-3.16.0/tools/Makefile.in 2015-03-23 17:27:56.000000000 +0000 +++ gnome-session-3.18.1.2/tools/Makefile.in 2015-10-15 20:46:20.000000000 +0000 @@ -323,6 +323,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@