diff -uhrN WindowMaker-0.92.0/aclocal.m4 WindowMaker-CVS-20060123/aclocal.m4
--- WindowMaker-0.92.0/aclocal.m4 2005-06-19 05:22:57.000000000 +0200
+++ WindowMaker-CVS-20060123/aclocal.m4 2006-01-22 21:33:50.000000000 +0100
@@ -1217,8 +1217,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 47 AC_PROG_LIBTOOL
-# Debian $Rev: 214 $
+# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1328,7 +1327,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
@@ -1348,7 +1347,7 @@
default_ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
@@ -1368,6 +1367,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
@@ -1387,15 +1387,17 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
;;
*)
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
;;
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+_LT_CC_BASENAME([$compiler])
+
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
@@ -1436,11 +1438,56 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
])# _LT_AC_SYS_COMPILER
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
+
+
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
@@ -1513,15 +1560,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test -z "$ECHO"; then
if test "X${echo_test_string+set}" != Xset; then
# find a string as large as possible, as long as the shell can cope with it
for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
# expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
- echo_test_string="`eval $cmd`" &&
+ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+ echo_test_string=`eval $cmd` &&
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
@@ -1690,7 +1737,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- case "`/usr/bin/file conftest.o`" in
+ case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
x86_64-*linux*)
@@ -1741,6 +1788,22 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ *) LD="${LD-ld} -64" ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -1772,7 +1835,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -1782,8 +1845,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
fi
fi
@@ -1809,11 +1874,16 @@
LDFLAGS="$LDFLAGS $3"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The compiler can only warn and ignore the option if not recognized
+ # The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
else
$2=yes
fi
@@ -1872,11 +1942,55 @@
lt_cv_sys_max_cmd_len=8192;
;;
- *)
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+ elif test -x /usr/sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+ else
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
+ fi
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+ # nice to cause kernel panics so lets avoid the loop below.
+ # First set a reasonable default.
+ lt_cv_sys_max_cmd_len=16384
+ #
+ if test -x /sbin/sysconfig; then
+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
+ esac
+ fi
+ ;;
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
+ ;;
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
+ *)
# 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"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
= "XX$teststring") >/dev/null 2>&1 &&
new_result=`expr "X$teststring" : ".*" 2>&1` &&
lt_cv_sys_max_cmd_len=$new_result &&
@@ -1902,7 +2016,7 @@
# _LT_AC_CHECK_DLFCN
-# --------------------
+# ------------------
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
@@ -1910,7 +2024,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
+# ---------------------------------------------------------------------
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
@@ -1976,17 +2090,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
+ else
+ puts (dlerror ());
exit (status);
}]
EOF
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) $1 ;;
x$lt_dlneed_uscore) $2 ;;
- x$lt_unknown|x*) $3 ;;
+ x$lt_dlunknown|x*) $3 ;;
esac
else :
# compilation failed
@@ -1998,7 +2114,7 @@
# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
+# ----------------------
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
@@ -2069,7 +2185,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -2082,7 +2198,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
@@ -2130,7 +2246,7 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -2142,11 +2258,13 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- if test ! -s out/conftest.err; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
fi
fi
- chmod u+w .
+ chmod u+w . 2>&AS_MESSAGE_LOG_FD
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
@@ -2210,8 +2328,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -2378,7 +2496,7 @@
shlibpath_var=LIBRARY_PATH
;;
-bsdi4*)
+bsdi[[45]]*)
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2406,7 +2524,8 @@
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'
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
@@ -2436,7 +2555,7 @@
;;
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
;;
@@ -2459,7 +2578,7 @@
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)'
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -2494,8 +2613,17 @@
dynamic_linker='GNU ld.so'
;;
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[[123]]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -2513,14 +2641,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
- freebsd3.[01]* | freebsdelf3.[01]*)
+ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
- *) # from 3.2 on
+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
@@ -2540,7 +2673,7 @@
version_type=sunos
need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
@@ -2580,6 +2713,18 @@
postinstall_cmds='chmod 555 $lib'
;;
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
@@ -2639,7 +2784,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -2713,8 +2858,13 @@
openbsd*)
version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=yes
+ # 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
@@ -2752,13 +2902,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
-sco3.2v5*)
- version_type=osf
- 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
- ;;
-
solaris*)
version_type=linux
need_lib_prefix=no
@@ -2784,7 +2927,7 @@
need_version=yes
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -2817,6 +2960,29 @@
fi
;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2830,6 +2996,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
@@ -2854,6 +3025,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
+ if test -z "$LTCFLAGS"; then
+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+ fi
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
@@ -2880,7 +3054,9 @@
case $tagname in
CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
@@ -2942,7 +3118,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
-# declare package support for building win32 dll's
+# declare package support for building win32 DLLs
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
@@ -2980,7 +3156,7 @@
# AC_DISABLE_SHARED
# -----------------
-#- set the default shared flag to --disable-shared
+# set the default shared flag to --disable-shared
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
@@ -3116,7 +3292,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
@@ -3226,7 +3402,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # 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 </dev/null` in
*GNU* | *'with BFD'*)
@@ -3258,7 +3434,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
@@ -3285,6 +3461,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ darwin*)
+ if test "$GCC" = yes; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
+ ;;
+esac
])# AC_PROG_LD_RELOAD_FLAG
@@ -3318,7 +3503,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-bsdi4*)
+bsdi[[45]]*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
lt_cv_file_magic_cmd='/usr/bin/file -L'
lt_cv_file_magic_test_file=/shlib/libc.so
@@ -3341,13 +3526,13 @@
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
# Not sure whether the presence of OpenBSD here was a mistake.
# Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
@@ -3363,7 +3548,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -3379,6 +3564,11 @@
esac
;;
+interix3*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+ ;;
+
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
@@ -3413,12 +3603,10 @@
;;
openbsd*)
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
else
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
fi
;;
@@ -3426,15 +3614,11 @@
lt_cv_deplibs_check_method=pass_all
;;
-sco3.2v5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
@@ -3455,10 +3639,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
;;
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
lt_cv_deplibs_check_method=pass_all
;;
esac
@@ -3478,36 +3665,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/${ac_tool_prefix}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:
- # 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'*)
- lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
+ 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
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+ 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
+ # Check to see if the nm accepts a BSD-compat flag.
+ # 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'*)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- continue # so that we can try to find one that supports BSD flags
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ ;;
+ esac
;;
esac
- esac
- fi
+ fi
+ done
+ IFS="$lt_save_ifs"
done
- IFS="$lt_save_ifs"
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
@@ -3539,13 +3733,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!). If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-convenience to the configure arguments. Note that
+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!). If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
@@ -3564,13 +3758,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
-# DIRECTORY is not provided and an installed libltdl is not found, it is
-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-# quotes!). If your package is not flat and you're not using automake,
-# define top_builddir and top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-install to the configure arguments. Note that
+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!). If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
@@ -3608,10 +3802,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
])# _LT_AC_LANG_CXX
+# _LT_AC_PROG_CXXCPP
+# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
# AC_LIBTOOL_F77
# --------------
@@ -3651,7 +3856,7 @@
# AC_LIBTOOL_RC
-# --------------
+# -------------
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
@@ -3684,36 +3889,9 @@
_LT_AC_SYS_COMPILER
-#
-# Check for any special shared library compilation flags.
-#
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
- case $host_os in
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
- ;;
- esac
-fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
- else
- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
- fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
AC_LIBTOOL_PROG_COMPILER_PIC($1)
@@ -3723,9 +3901,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
+AC_LIBTOOL_DLOPEN_SELF
-# Report which librarie types wil actually be built
+# Report which library types will actually be built
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
@@ -3734,7 +3912,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
+case $host_os in
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
@@ -3747,43 +3925,6 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
- ;;
- darwin* | rhapsody*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
;;
esac
AC_MSG_RESULT([$enable_shared])
@@ -3809,7 +3950,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -3821,6 +3962,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
@@ -3838,7 +3980,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
# Object file extension for compiled C++ test sources.
objext=o
@@ -3848,11 +3990,15 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
@@ -3863,18 +4009,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
- unset lt_cv_prog_gnu_ld
+ $as_unset lt_cv_prog_gnu_ld
fi
if test -n "${lt_cv_path_LDCXX+set}"; then
lt_cv_path_LD=$lt_cv_path_LDCXX
else
- unset lt_cv_path_LD
+ $as_unset lt_cv_path_LD
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
compiler=$CC
_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+_LT_CC_BASENAME([$compiler])
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
@@ -3963,6 +4109,7 @@
;;
esac
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -3981,7 +4128,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
- case $host_os in aix4.[012]|aix4.[012].*)
+ 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`
@@ -4000,8 +4147,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
+ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -4028,12 +4179,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
@@ -4042,16 +4193,26 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
# Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
+
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
chorus*)
case $cc_basename in
*)
@@ -4070,7 +4231,7 @@
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -4079,70 +4240,81 @@
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}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
+ darwin* | rhapsody*)
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+ ;;
+ *) # Darwin 1.3 on
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ else
+ case ${MACOSX_DEPLOYMENT_TARGET} in
+ 10.[[012]])
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ ;;
+ 10.*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+ ;;
+ esac
+ fi
+ ;;
+ esac
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- darwin* | rhapsody*)
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+ if test "$GXX" = yes ; then
+ lt_int_apple_cc_single_mod=no
+ output_verbose_link_cmd='echo'
+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+ lt_int_apple_cc_single_mod=yes
+ fi
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
- ;;
- esac
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ fi
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -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'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
+ ;;
dgux*)
case $cc_basename in
- ec++)
+ ec++*)
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- ghcx)
+ ghcx*)
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -4153,14 +4325,14 @@
;;
esac
;;
- freebsd[12]*)
+ freebsd[[12]]*)
# C++ shared libraries reported to be fairly broken before switch to ELF
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -4177,11 +4349,11 @@
# location of the library.
case $cc_basename in
- CC)
+ CC*)
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aCC)
+ aCC*)
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -4191,7 +4363,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $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; echo $list'
;;
*)
if test "$GXX" = yes; then
@@ -4205,33 +4377,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
- ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
;;
*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
esac
fi
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- ia64*)
+ case $host_cpu in
+ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -4242,14 +4403,17 @@
esac
case $cc_basename in
- CC)
+ CC*)
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aCC)
- case "$host_cpu" in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ aCC*)
+ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -4268,9 +4432,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
- case "$host_cpu" in
- ia64*|hppa*64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -4284,11 +4451,25 @@
;;
esac
;;
+ interix3*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
irix5* | irix6*)
case $cc_basename in
- CC)
+ CC*)
# SGI C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -4299,7 +4480,7 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
@@ -4312,7 +4493,7 @@
;;
linux*)
case $cc_basename in
- KCC)
+ KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
@@ -4337,17 +4518,41 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
- icpc)
+ icpc*)
# Intel C++
with_gnu_ld=yes
+ # version 8.0 and above of icpc choke on multiply defined symbols
+ # if we add $predep_objects and $postdep_objects, however 7.1 and
+ # earlier do not add the objects themselves.
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
+ case $host_cpu in
+ ia64*) tmp_idyn=' -i_dynamic';;
+ esac
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
+ pgCC*)
+ # Portland Group C++ compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
# Compaq C++
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -4378,7 +4583,7 @@
;;
mvs*)
case $cc_basename in
- cxx)
+ cxx*)
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -4399,9 +4604,25 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
+ openbsd2*)
+ # C++ shared libraries are fairly broken
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ openbsd*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd='echo'
+ ;;
osf3*)
case $cc_basename in
- KCC)
+ KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
@@ -4417,14 +4638,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
- RCC)
+ RCC*)
# Rational C++ 2.4.1
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- cxx)
+ cxx*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -4442,7 +4663,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -4461,7 +4682,7 @@
;;
osf4* | osf5*)
case $cc_basename in
- KCC)
+ KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
@@ -4476,17 +4697,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
- RCC)
+ RCC*)
# Rational C++ 2.4.1
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- cxx)
+ cxx*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -4505,7 +4726,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -4526,27 +4747,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- sco*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ sunos4*)
case $cc_basename in
- CC)
+ CC*)
+ # Sun C++ 4.x
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- sunos4*)
- case $cc_basename in
- CC)
- # Sun C++ 4.x
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- lcc)
+ lcc*)
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -4559,36 +4767,33 @@
;;
solaris*)
case $cc_basename in
- CC)
+ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
+ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The C++ compiler is used as linker so we must use $wl
# flag to pass the commands to the underlying system
- # linker.
+ # linker. We must also pass each convience library through
+ # to the system linker between allextract/defaultextract.
+ # The C++ compiler will combine linker options so we
+ # cannot just pass the convience library names through
+ # without $wl.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ output_verbose_link_cmd='echo'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -4596,7 +4801,7 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
- gcx)
+ gcx*)
# Green Hills C++ Compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
@@ -4634,12 +4839,63 @@
;;
esac
;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ # So that behaviour is only enabled if SCOABSPATH is set to a
+ # non-empty value in the environment. Most likely only useful for
+ # creating official distributions of packages.
+ # This is a hack until libtool officially supports absolute path
+ # names for shared libraries.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
;;
tandem*)
case $cc_basename in
- NCC)
+ NCC*)
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -4672,8 +4928,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
AC_LIBTOOL_CONFIG($1)
@@ -4691,7 +4945,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------
+# ------------------------------------
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
@@ -4745,7 +4999,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
for p in `eval $output_verbose_link_cmd`; do
case $p in
@@ -4821,13 +5075,37 @@
$rm -f confest.$objext
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix3*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ _LT_AC_TAGVAR(predep_objects,$1)=
+ _LT_AC_TAGVAR(postdep_objects,$1)=
+ _LT_AC_TAGVAR(postdeps,$1)=
+ ;;
+
+solaris*)
+ case $cc_basename in
+ CC*)
+ # 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.
+ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+ ;;
+ esac
+ ;;
+esac
+])
+
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
])# AC_LIBTOOL_POSTDEP_PREDEP
# AC_LIBTOOL_LANG_F77_CONFIG
-# ------------------------
+# --------------------------
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
@@ -4871,12 +5149,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
CC=${F77-"f77"}
compiler=$CC
_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+_LT_CC_BASENAME([$compiler])
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
@@ -4886,7 +5168,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
+case $host_os in
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
@@ -4895,7 +5177,9 @@
fi
;;
aix4* | aix5*)
- test "$enable_shared" = yes && enable_static=no
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
;;
esac
AC_MSG_RESULT([$enable_shared])
@@ -4905,8 +5189,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
@@ -4916,8 +5198,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-
AC_LIBTOOL_CONFIG($1)
@@ -4946,20 +5226,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
CC=${GCJ-"gcj"}
compiler=$CC
_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
# GCJ did not exist at the time GCC didn't implicitly link libc in.
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
AC_LIBTOOL_PROG_COMPILER_PIC($1)
AC_LIBTOOL_PROG_CC_C_O($1)
@@ -4967,8 +5254,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
AC_LIBTOOL_CONFIG($1)
@@ -4978,7 +5263,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
-# --------------------------
+# -------------------------
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
@@ -5002,11 +5287,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
CC=${RC-"windres"}
compiler=$CC
_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
@@ -5036,7 +5326,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -5142,7 +5432,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -5153,11 +5443,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
# The names of the tagged configurations supported by this script.
available_tags=
@@ -5188,6 +5478,12 @@
# The host system.
host_alias=$host_alias
host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
# An echo program that does not interpret backslashes.
echo=$lt_echo
@@ -5199,6 +5495,9 @@
# A C compiler.
LTCC=$lt_LTCC
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
@@ -5264,7 +5563,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
@@ -5538,9 +5837,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
@@ -5562,15 +5858,31 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
+linux*)
+ if test "$host_cpu" = ia64; then
+ symcode='[[ABCDGIRSTW]]'
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ fi
+ ;;
irix* | nonstopux*)
symcode='[[BCDEGRST]]'
;;
osf*)
symcode='[[BCDEGQRST]]'
;;
-solaris* | sysv5*)
+solaris*)
symcode='[[BDRT]]'
;;
+sco3.2v5*)
+ symcode='[[DT]]'
+ ;;
+sysv4.2uw2*)
+ symcode='[[DT]]'
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='[[ABDT]]'
+ ;;
sysv4)
symcode='[[DFNSTU]]'
;;
@@ -5593,8 +5905,11 @@
# Try without a prefix undercore, then with it.
for ac_symprfx in "" "_"; do
+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+ symxfrm="\\1 $ac_symprfx\\2 \\2"
+
# Write the raw and C identifiers.
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -5750,6 +6065,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
@@ -5758,7 +6077,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
;;
*)
@@ -5783,18 +6102,28 @@
;;
chorus*)
case $cc_basename in
- cxch68)
+ cxch68*)
# Green Hills C++ Compiler
# _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
;;
esac
;;
+ darwin*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ case $cc_basename in
+ xlc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ ;;
+ esac
+ ;;
dgux*)
case $cc_basename in
- ec++)
+ ec++*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
- ghcx)
+ ghcx*)
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
@@ -5802,22 +6131,22 @@
;;
esac
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
case $cc_basename in
- CC)
+ CC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
;;
- aCC)
+ aCC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- case "$host_cpu" in
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -5830,9 +6159,13 @@
;;
esac
;;
+ interix*)
+ # This is c89, which is MS Visual C++ (no shared libs)
+ # Anyone wants to do a port?
+ ;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
- CC)
+ CC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
# CC pic flag -KPIC is the default.
@@ -5843,18 +6176,24 @@
;;
linux*)
case $cc_basename in
- KCC)
+ KCC*)
# KAI C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
- icpc)
+ icpc* | ecpc*)
# Intel C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
- cxx)
+ pgCC*)
+ # Portland Group C++ compiler.
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ cxx*)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
@@ -5871,7 +6210,7 @@
;;
mvs*)
case $cc_basename in
- cxx)
+ cxx*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
;;
*)
@@ -5882,14 +6221,14 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
- KCC)
+ KCC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
;;
- RCC)
+ RCC*)
# Rational C++ 2.4.1
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
- cxx)
+ cxx*)
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
@@ -5903,24 +6242,15 @@
;;
psos*)
;;
- sco*)
- case $cc_basename in
- CC)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- *)
- ;;
- esac
- ;;
solaris*)
case $cc_basename in
- CC)
+ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
;;
- gcx)
+ gcx*)
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
@@ -5930,12 +6260,12 @@
;;
sunos4*)
case $cc_basename in
- CC)
+ CC*)
# Sun C++ 4.x
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- lcc)
+ lcc*)
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
@@ -5945,7 +6275,7 @@
;;
tandem*)
case $cc_basename in
- NCC)
+ NCC*)
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
@@ -5953,7 +6283,14 @@
;;
esac
;;
- unixware*)
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ esac
;;
vxworks*)
;;
@@ -6000,6 +6337,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
@@ -6016,7 +6358,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -6042,6 +6384,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
+ darwin*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ case $cc_basename in
+ xlc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ ;;
+ esac
+ ;;
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
@@ -6053,7 +6405,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -6077,12 +6429,19 @@
;;
linux*)
- case $CC in
+ case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
@@ -6097,15 +6456,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
- ;;
-
solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ case $cc_basename in
+ f77* | f90* | f95*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+ esac
;;
sunos4*)
@@ -6114,7 +6473,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -6127,6 +6486,17 @@
fi
;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ unicos*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
+
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -6154,7 +6524,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
@@ -6163,6 +6533,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
])
@@ -6187,7 +6567,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ kfreebsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
;;
linux*)
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
@@ -6233,7 +6616,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
-
+ # Just being paranoid about ensuring that cc_basename is set.
+ _LT_CC_BASENAME([$compiler])
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -6243,6 +6627,10 @@
with_gnu_ld=no
fi
;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
openbsd*)
with_gnu_ld=no
;;
@@ -6253,6 +6641,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>/dev/null` in
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+ *\ 2.11.*) ;; # other 2.11 versions
+ *) supports_anon_versioning=yes ;;
+ esac
+
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
@@ -6303,10 +6712,10 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -6315,9 +6724,56 @@
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}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $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
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ interix3*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
@@ -6331,7 +6787,7 @@
fi
;;
- solaris* | sysv5*)
+ solaris*)
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
@@ -6352,6 +6808,33 @@
fi
;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
@@ -6359,32 +6842,6 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
- fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -6395,16 +6852,11 @@
;;
esac
- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
- runpath_var=LD_RUN_PATH
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- fi
+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+ runpath_var=
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
@@ -6416,7 +6868,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -6450,6 +6902,7 @@
break
fi
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -6468,7 +6921,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
- case $host_os in aix4.[012]|aix4.[012].*)
+ 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`
@@ -6487,8 +6940,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
+ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -6496,11 +6953,11 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+ if test "$aix_use_runtimelinking" = yes; then
shared_flag='${wl}-G'
else
shared_flag='${wl}-bM:SRE'
- fi
+ fi
fi
fi
@@ -6514,12 +6971,12 @@
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
@@ -6528,13 +6985,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
# Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -6547,7 +7002,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- bsdi4*)
+ bsdi[[45]]*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
@@ -6568,57 +7023,57 @@
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
_LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
- ;;
- esac
- fi
- ;;
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+ ;;
+ *) # Darwin 1.3 on
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ else
+ case ${MACOSX_DEPLOYMENT_TARGET} in
+ 10.[[012]])
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ ;;
+ 10.*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+ ;;
+ esac
+ fi
+ ;;
esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -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'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
fi
;;
@@ -6652,11 +7107,20 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd* | dragonfly*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+ kfreebsd*-gnu)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
;;
hpux9*)
@@ -6675,47 +7139,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
- hpux10* | hpux11*)
+ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_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_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
- case "$host_cpu" in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
@@ -6763,6 +7242,7 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
@@ -6808,7 +7288,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6816,21 +7296,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
- sco3.2v5*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
+ wlarc='${wl}'
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
+ wlarc=''
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -6839,8 +7313,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+ *)
+ # The compiler driver will combine linker options so we
+ # cannot just pass the convience library names through
+ # without $wl, iff we do not link with $LD.
+ # Luckily, gcc supports the same syntax we need for Sun Studio.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ case $wlarc in
+ '')
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+ *)
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ esac ;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -6897,36 +7381,45 @@
fi
;;
- sysv4.2uw2*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
+ runpath_var='LD_RUN_PATH'
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
- runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- sysv5*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
;;
uts4*)
@@ -6944,11 +7437,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
#
# Do we need to explicitly link libc?
#
@@ -6976,6 +7464,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
compiler_flags=-v
linker_flags=-v
verstring=
@@ -7101,7 +7590,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 && break
+ test ! -f $lt_ac_sed && continue
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7126,8 +7615,8 @@
fi
done
done
-SED=$lt_cv_path_SED
])
+SED=$lt_cv_path_SED
AC_MSG_RESULT([$SED])
])
diff -uhrN WindowMaker-0.92.0/ChangeLog WindowMaker-CVS-20060123/ChangeLog
--- WindowMaker-0.92.0/ChangeLog 2005-07-03 19:36:39.000000000 +0200
+++ WindowMaker-CVS-20060123/ChangeLog 2006-01-23 07:47:10.000000000 +0100
@@ -1,3 +1,37 @@
+Changes since version 0.92.0:
+.............................
+
+- added check for --with-gnustepdir option to configure to verify that its
+ argument is an absolute path
+- updated german translations (Torsten Marek <shlomme@gmx.net>)
+- fixed WPrefs.app to find its icons when not installed under GNUstep paths
+- fixed gcc-4 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
+- fixed amd64 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
+- eliminated gcc-4 compilation warnings
+- small fix for compilation in a different directory than the source
+ (Balaton Zoltan <balaton@eik.bme.hu>)
+- fixed some warnings on 64bit platforms (Balaton Zoltan <balaton@eik.bme.hu>)
+- fixed issue with invisible modal windows from Qt and Gtk applications
+ on 64bit platforms (Max Loparyev <max@city.veganet.ru>)
+- fixed issue with icon colors on big endian platforms
+ (Max Loparyev <max@city.veganet.ru>)
+- release colors to avoid issues with the reference count overflowing a
+ small integer and causing unexpected color releases that can crash
+ Window Maker (Martin Frydl <martin.frydl@systinet.com>)
+- fixed a small memory leak in WINGs/wview.c caused by not releasing the
+ background color of a view (Martin Frydl <martin.frydl@systinet.com>)
+- updated estonian translation (Ivar Smolin <okul@linux.ee>)
+- updated the XDND code in WINGs to work with GDK based applications.
+ WINGs based applications should now work with both KDE and GNOME
+ applications (Sylvain Reynal <sreynal@nerim.net>)
+- better check for the XDND protocol version when interoperating with other
+ applications. As it seems xdnd version 3 (which WINGs supports) and newer
+ are not backward compatible with xdnd version 1 and 2. This is why WINGs
+ applications cannot interoperate with GNUstep applications (which uses
+ xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
+ version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
+
+
Changes since version 0.91.0:
.............................
diff -uhrN WindowMaker-0.92.0/config.guess WindowMaker-CVS-20060123/config.guess
--- WindowMaker-0.92.0/config.guess 2005-06-19 05:22:56.000000000 +0200
+++ WindowMaker-CVS-20060123/config.guess 2005-08-14 05:51:20.000000000 +0200
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-04-22'
+timestamp='2005-08-03'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Originally written by Per Bothner <per@bothner.com>.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -66,11 +68,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -123,7 +125,7 @@
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -196,55 +198,20 @@
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
- amd64:OpenBSD:*:*)
- echo x86_64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- cats:OpenBSD:*:*)
- echo arm-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- luna88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mips64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
macppc:MirBSD:*:*)
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -297,40 +264,43 @@
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ exit ;;
*:z/VM:*:*)
echo s390-ibm-zvmoe
- exit 0 ;;
+ exit ;;
*:OS400:*:*)
echo powerpc-ibm-os400
- exit 0 ;;
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -338,32 +308,32 @@
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
+ exit ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit 0 ;;
+ exit ;;
DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -372,10 +342,10 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -387,10 +357,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -401,40 +371,40 @@
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -458,32 +428,33 @@
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit 0 ;;
+ exit ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit 0 ;;
+ exit ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit 0 ;;
+ exit ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit 0 ;;
+ exit ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -499,29 +470,29 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit 0 ;;
+ exit ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit 0 ;;
+ exit ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit 0 ;;
+ exit ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit 0 ;;
+ exit ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -529,7 +500,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -544,14 +515,18 @@
exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit 0 ;;
+ exit ;;
*:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -565,28 +540,28 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit 0 ;;
+ exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit 0 ;;
+ exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
+ exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit 0 ;;
+ exit ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit 0 ;;
+ exit ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit 0 ;;
+ exit ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -648,9 +623,19 @@
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- # avoid double evaluation of $set_cc_for_build
- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -658,11 +643,11 @@
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -690,161 +675,166 @@
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
- exit 0 ;;
+ exit ;;
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
- exit 0 ;;
+ exit ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
- exit 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit 0 ;;
+ exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
echo ${UNAME_MACHINE}-unknown-osf1
fi
- exit 0 ;;
+ exit ;;
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
- exit 0 ;;
+ exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
*:UNICOS/mp:*:*)
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
5000:UNIX_System_V:4.*:*)
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:FreeBSD:*:*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
+ exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
+ exit ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
+ exit ;;
x86:Interix*:[34]*)
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- exit 0 ;;
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
- exit 0 ;;
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
echo i586-pc-interix
- exit 0 ;;
+ exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
- amd64:CYGWIN*:*:*)
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
- exit 0 ;;
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
- exit 0 ;;
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
*:GNU:*:*)
# the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
+ exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- exit 0 ;;
+ exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
+ exit ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
- exit 0 ;;
+ exit ;;
crisv32:Linux:*:*)
echo crisv32-axis-linux-gnu
- exit 0 ;;
+ exit ;;
frv:Linux:*:*)
echo frv-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -862,7 +852,7 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
eval $set_cc_for_build
@@ -881,14 +871,17 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -902,7 +895,7 @@
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -910,25 +903,25 @@
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit 0 ;;
+ exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
+ exit ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -946,15 +939,15 @@
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
+ exit ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0 ;;
+ exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit 0 ;;
+ exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
@@ -982,15 +975,18 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ test x"${LIBC}" != x && {
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
# sysname and nodename.
echo i386-sequent-sysv4
- exit 0 ;;
+ exit ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
@@ -998,27 +994,27 @@
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
+ exit ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
+ exit ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
- i*86:syllable:*:*)
+ exit ;;
+ i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
- exit 0 ;;
+ exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1026,15 +1022,16 @@
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
- exit 0 ;;
- i*86:*:5:[78]*)
+ exit ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1052,73 +1049,73 @@
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
- exit 0 ;;
+ exit ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
- exit 0 ;;
+ exit ;;
paragon:*:*:*)
echo i860-intel-osf1
- exit 0 ;;
+ exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
- exit 0 ;;
+ exit ;;
mini*:CTIX:SYS*5:*)
# "miniframe"
echo m68010-convergent-sysv
- exit 0 ;;
+ exit ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
- exit 0 ;;
+ exit ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
- exit 0 ;;
+ exit ;;
M68*:*:R3V[5678]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
+ && { echo i486-ncr-sysv4; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
- exit 0 ;;
+ exit ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1126,65 +1123,65 @@
else
echo ns32k-sni-sysv
fi
- exit 0 ;;
+ exit ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel@ccMail.Census.GOV>
echo i586-unisys-sysv4
- exit 0 ;;
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes@openmarket.com>.
# How about differentiating between stratus architectures? -djm
echo hppa1.1-stratus-sysv4
- exit 0 ;;
+ exit ;;
*:*:*:FTX*)
# From seanf@swdc.stratus.com.
echo i860-stratus-sysv4
- exit 0 ;;
+ exit ;;
i*86:VOS:*:*)
# From Paul.Green@stratus.com.
echo ${UNAME_MACHINE}-stratus-vos
- exit 0 ;;
+ exit ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
- exit 0 ;;
+ exit ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
- exit 0 ;;
+ exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
- exit 0 ;;
+ exit ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
- exit 0 ;;
+ exit ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
- exit 0 ;;
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
@@ -1192,7 +1189,7 @@
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1200,25 +1197,25 @@
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit 0 ;;
+ exit ;;
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
- exit 0 ;;
+ exit ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
- exit 0 ;;
+ exit ;;
DS/*:UNIX_System_V:*:*)
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
@@ -1229,41 +1226,44 @@
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
+ exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
- exit 0 ;;
+ exit ;;
*:TENEX:*:*)
echo pdp10-unknown-tenex
- exit 0 ;;
+ exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
- exit 0 ;;
+ exit ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
echo pdp10-xkl-tops20
- exit 0 ;;
+ exit ;;
*:TOPS-20:*:*)
echo pdp10-unknown-tops20
- exit 0 ;;
+ exit ;;
*:ITS:*:*)
echo pdp10-unknown-its
- exit 0 ;;
+ exit ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
+ exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms && exit 0 ;;
- I*) echo ia64-dec-vms && exit 0 ;;
- V*) echo vax-dec-vms && exit 0 ;;
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
esac ;;
*:XENIX:*:SysV)
echo i386-pc-xenix
- exit 0 ;;
+ exit ;;
+ i*86:skyos:*:*)
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1295,7 +1295,7 @@
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix"); exit (0);
+ printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
@@ -1384,11 +1384,12 @@
}
EOF
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
@@ -1397,22 +1398,22 @@
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
c34*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
c38*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
c4*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
esac
fi
diff -uhrN WindowMaker-0.92.0/config.sub WindowMaker-CVS-20060123/config.sub
--- WindowMaker-0.92.0/config.sub 2005-06-19 05:22:56.000000000 +0200
+++ WindowMaker-CVS-20060123/config.sub 2005-08-14 05:51:20.000000000 +0200
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-04-22'
+timestamp='2005-07-08'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
@@ -83,11 +84,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -99,7 +100,7 @@
*local*)
# First pass through any local machine types.
echo $1
- exit 0;;
+ exit ;;
* )
break ;;
@@ -247,6 +248,7 @@
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
@@ -255,13 +257,14 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | ms1 \
| msp430 \
| ns16k | ns32k \
- | openrisc | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b \
@@ -273,6 +276,9 @@
| z8k)
basic_machine=$basic_machine-unknown
;;
+ m32c)
+ basic_machine=$basic_machine-unknown
+ ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -321,6 +327,7 @@
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
@@ -329,6 +336,7 @@
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
+ | ms1-* \
| msp430-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
@@ -336,7 +344,7 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
| sparclite-* \
@@ -351,6 +359,8 @@
| ymp-* \
| z8k-*)
;;
+ m32c-*)
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -761,9 +771,8 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
- or32 | or32-*)
+ openrisc | openrisc-*)
basic_machine=or32-unknown
- os=-coff
;;
os400)
basic_machine=powerpc-ibm
@@ -1089,12 +1098,9 @@
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
@@ -1181,7 +1187,8 @@
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1199,7 +1206,7 @@
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
@@ -1388,6 +1395,9 @@
*-be)
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
;;
@@ -1559,7 +1569,7 @@
esac
echo $basic_machine$os
-exit 0
+exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff -uhrN WindowMaker-0.92.0/configure WindowMaker-CVS-20060123/configure
--- WindowMaker-0.92.0/configure 2005-06-19 05:23:02.000000000 +0200
+++ WindowMaker-CVS-20060123/configure 2006-01-22 21:33:55.000000000 +0100
@@ -278,15 +278,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test -z "$ECHO"; then
if test "X${echo_test_string+set}" != Xset; then
# find a string as large as possible, as long as the shell can cope with it
for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
# expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
- echo_test_string="`eval $cmd`" &&
+ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+ echo_test_string=`eval $cmd` &&
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
@@ -2885,7 +2885,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 && break
+ test ! -f $lt_ac_sed && continue
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -2910,10 +2910,10 @@
fi
done
done
-SED=$lt_cv_path_SED
fi
+SED=$lt_cv_path_SED
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -2990,7 +2990,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # 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 </dev/null` in
*GNU* | *'with BFD'*)
@@ -3024,7 +3024,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
@@ -3054,6 +3054,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ darwin*)
+ if test "$GCC" = yes; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
+ ;;
+esac
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -3064,36 +3073,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/${ac_tool_prefix}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:
- # 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'*)
- lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
+ 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
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+ 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
+ # Check to see if the nm accepts a BSD-compat flag.
+ # 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'*)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- continue # so that we can try to find one that supports BSD flags
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ ;;
+ esac
;;
esac
- esac
- fi
+ fi
+ done
+ IFS="$lt_save_ifs"
done
- IFS="$lt_save_ifs"
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
@@ -3140,7 +3156,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-bsdi4*)
+bsdi[45]*)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
lt_cv_file_magic_cmd='/usr/bin/file -L'
lt_cv_file_magic_test_file=/shlib/libc.so
@@ -3163,13 +3179,13 @@
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
# Not sure whether the presence of OpenBSD here was a mistake.
# Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
@@ -3185,7 +3201,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -3201,6 +3217,11 @@
esac
;;
+interix3*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+ ;;
+
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
@@ -3235,12 +3256,10 @@
;;
openbsd*)
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
else
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
fi
;;
@@ -3248,15 +3267,11 @@
lt_cv_deplibs_check_method=pass_all
;;
-sco3.2v5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
@@ -3277,10 +3292,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
;;
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
lt_cv_deplibs_check_method=pass_all
;;
esac
@@ -3298,6 +3316,9 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
@@ -3333,7 +3354,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3336 "configure"' > conftest.$ac_ext
+ echo '#line 3357 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -3376,7 +3397,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- case "`/usr/bin/file conftest.o`" in
+ case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
x86_64-*linux*)
@@ -3488,6 +3509,26 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ *) LD="${LD-ld} -64" ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
esac
@@ -4465,7 +4506,12 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_ext=cc
+
+
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -4695,6 +4741,8 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+fi
+
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
@@ -4788,7 +4836,7 @@
# Provide some information about the compiler.
-echo "$as_me:4791:" \
+echo "$as_me:4839:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -4976,11 +5024,55 @@
lt_cv_sys_max_cmd_len=8192;
;;
- *)
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+ elif test -x /usr/sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+ else
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
+ fi
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+ # nice to cause kernel panics so lets avoid the loop below.
+ # First set a reasonable default.
+ lt_cv_sys_max_cmd_len=16384
+ #
+ if test -x /sbin/sysconfig; then
+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
+ esac
+ fi
+ ;;
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
+ ;;
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
+ *)
# 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"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
= "XX$teststring") >/dev/null 2>&1 &&
new_result=`expr "X$teststring" : ".*" 2>&1` &&
lt_cv_sys_max_cmd_len=$new_result &&
@@ -5026,9 +5118,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
@@ -5050,15 +5139,31 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
+linux*)
+ if test "$host_cpu" = ia64; then
+ symcode='[ABCDGIRSTW]'
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ fi
+ ;;
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
osf*)
symcode='[BCDEGQRST]'
;;
-solaris* | sysv5*)
+solaris*)
symcode='[BDRT]'
;;
+sco3.2v5*)
+ symcode='[DT]'
+ ;;
+sysv4.2uw2*)
+ symcode='[DT]'
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='[ABDT]'
+ ;;
sysv4)
symcode='[DFNSTU]'
;;
@@ -5081,8 +5186,11 @@
# Try without a prefix undercore, then with it.
for ac_symprfx in "" "_"; do
+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+ symxfrm="\\1 $ac_symprfx\\2 \\2"
+
# Write the raw and C identifiers.
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -5244,7 +5352,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
@@ -5264,7 +5372,7 @@
default_ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
@@ -5521,6 +5629,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
@@ -5540,15 +5649,26 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
;;
*)
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
;;
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
@@ -5574,7 +5694,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
@@ -5636,7 +5756,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
@@ -5731,68 +5851,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
-#
-# Check for any special shared library compilation flags.
-#
-lt_prog_cc_shlib=
-if test "$GCC" = no; then
- case $host_os in
- sco3.2v5*)
- lt_prog_cc_shlib='-belf'
- ;;
- esac
-fi
-if test -n "$lt_prog_cc_shlib"; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
- if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then :
- else
- { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
- lt_cv_prog_cc_can_build_shared=no
- fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&5
- else
- lt_prog_compiler_static_works=yes
- fi
- fi
- $rm conftest*
- LDFLAGS="$save_LDFLAGS"
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-
-if test x"$lt_prog_compiler_static_works" = xyes; then
- :
-else
- lt_prog_compiler_static=
-fi
-
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
@@ -5817,18 +5894,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:5823: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:5900: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:5827: \$? = $ac_status" >&5
+ echo "$as_me:5904: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
@@ -5889,6 +5968,11 @@
lt_prog_compiler_pic='-fno-common'
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
@@ -5905,7 +5989,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -5931,6 +6015,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
+ darwin*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ case $cc_basename in
+ xlc*)
+ lt_prog_compiler_pic='-qnocommon'
+ lt_prog_compiler_wl='-Wl,'
+ ;;
+ esac
+ ;;
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
@@ -5942,7 +6036,7 @@
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -5966,12 +6060,19 @@
;;
linux*)
- case $CC in
+ case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fpic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
@@ -5986,15 +6087,15 @@
lt_prog_compiler_static='-non_shared'
;;
- sco3.2v5*)
- lt_prog_compiler_pic='-Kpic'
- lt_prog_compiler_static='-dn'
- ;;
-
solaris*)
- lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
+ case $cc_basename in
+ f77* | f90* | f95*)
+ lt_prog_compiler_wl='-Qoption ld ';;
+ *)
+ lt_prog_compiler_wl='-Wl,';;
+ esac
;;
sunos4*)
@@ -6003,7 +6104,7 @@
lt_prog_compiler_static='-Bstatic'
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
@@ -6016,6 +6117,17 @@
fi
;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ unicos*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_can_build_shared=no
+ ;;
+
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
@@ -6050,18 +6162,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6056: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6168: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6060: \$? = $ac_status" >&5
+ echo "$as_me:6172: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works=yes
fi
fi
@@ -6082,7 +6196,7 @@
fi
fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
@@ -6092,6 +6206,48 @@
;;
esac
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_static_works=yes
+ fi
+ else
+ lt_prog_compiler_static_works=yes
+ fi
+ fi
+ $rm conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+
+if test x"$lt_prog_compiler_static_works" = xyes; then
+ :
+else
+ lt_prog_compiler_static=
+fi
+
+
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
@@ -6110,23 +6266,25 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6116: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6272: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6120: \$? = $ac_status" >&5
+ echo "$as_me:6276: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- if test ! -s out/conftest.err; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
fi
fi
- chmod u+w .
+ chmod u+w . 2>&5
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
@@ -6202,6 +6360,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
case $host_os in
cygwin* | mingw* | pw32*)
@@ -6212,6 +6380,10 @@
with_gnu_ld=no
fi
;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
openbsd*)
with_gnu_ld=no
;;
@@ -6222,6 +6394,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+ export_dynamic_flag_spec='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec=
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>/dev/null` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+ *\ 2.11.*) ;; # other 2.11 versions
+ *) supports_anon_versioning=yes ;;
+ esac
+
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
@@ -6272,10 +6465,10 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$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 (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -6284,7 +6477,54 @@
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}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $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
+ ;;
+
+ interix3*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+ archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ link_all_deplibs=no
else
ld_shlibs=no
fi
@@ -6300,7 +6540,7 @@
fi
;;
- solaris* | sysv5*)
+ solaris*)
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
@@ -6321,6 +6561,33 @@
fi
;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+ ;;
+
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
@@ -6328,32 +6595,6 @@
hardcode_shlibpath_var=no
;;
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_cmds="$tmp_archive_cmds"
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- archive_expsym_cmds="$tmp_archive_cmds"
- fi
- link_all_deplibs=no
- else
- ld_shlibs=no
- fi
- ;;
-
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -6364,16 +6605,11 @@
;;
esac
- if test "$ld_shlibs" = yes; then
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec=
- fi
+ if test "$ld_shlibs" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec=
+ export_dynamic_flag_spec=
+ whole_archive_flag_spec=
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
@@ -6385,7 +6621,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 "$link_static_flag"; then
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
@@ -6419,6 +6655,7 @@
break
fi
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -6437,7 +6674,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
- case $host_os in aix4.012|aix4.012.*)
+ 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`
@@ -6456,8 +6693,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
+ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -6465,11 +6706,11 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+ if test "$aix_use_runtimelinking" = yes; then
shared_flag='${wl}-G'
else
shared_flag='${wl}-bM:SRE'
- fi
+ fi
fi
fi
@@ -6533,12 +6774,12 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_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.
cat >conftest.$ac_ext <<_ACEOF
@@ -6597,13 +6838,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec=' '
+ whole_archive_flag_spec='$convenience'
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -6616,7 +6855,7 @@
ld_shlibs=no
;;
- bsdi4*)
+ bsdi[45]*)
export_dynamic_flag_spec=-rdynamic
;;
@@ -6642,52 +6881,52 @@
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
- archive_cmds_need_lc=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
- allow_undefined_flag='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag='-undefined dynamic_lookup'
- ;;
- esac
- fi
- ;;
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ allow_undefined_flag='${wl}-undefined ${wl}suppress'
+ ;;
+ *) # Darwin 1.3 on
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ else
+ case ${MACOSX_DEPLOYMENT_TARGET} in
+ 10.[012])
+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ ;;
+ 10.*)
+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
+ ;;
+ esac
+ fi
+ ;;
esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds='$CC -r ${wl}-bind_at_load -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'
- fi
- module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_cmds_need_lc=no
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec='-all_load $convenience'
+ whole_archive_flag_spec=''
link_all_deplibs=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
- ld_shlibs=no
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+ ld_shlibs=no
+ ;;
+ esac
fi
;;
@@ -6721,11 +6960,20 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd* | dragonfly*)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+ kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ link_all_deplibs=no
;;
hpux9*)
@@ -6744,47 +6992,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
- hpux10* | hpux11*)
+ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+
+ hardcode_direct=yes
+ export_dynamic_flag_spec='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
+ ia64*)
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld='+b $libdir'
- hardcode_libdir_separator=:
- hardcode_direct=no
- hardcode_shlibpath_var=no
- ;;
- ia64*)
- hardcode_libdir_flag_spec='-L$libdir'
hardcode_direct=no
hardcode_shlibpath_var=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
;;
*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
@@ -6832,6 +7095,7 @@
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
@@ -6877,7 +7141,7 @@
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -6885,21 +7149,15 @@
hardcode_libdir_separator=:
;;
- sco3.2v5*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var=no
- export_dynamic_flag_spec='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
+ wlarc='${wl}'
archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
+ wlarc=''
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -6908,8 +7166,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+ *)
+ # The compiler driver will combine linker options so we
+ # cannot just pass the convience library names through
+ # without $wl, iff we do not link with $LD.
+ # Luckily, gcc supports the same syntax we need for Sun Studio.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ case $wlarc in
+ '')
+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+ *)
+ whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ esac ;;
esac
link_all_deplibs=yes
;;
@@ -6966,36 +7234,45 @@
fi
;;
- sysv4.2uw2*)
- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes
- hardcode_minus_L=no
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ no_undefined_flag='${wl}-z,text'
+ archive_cmds_need_lc=no
hardcode_shlibpath_var=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
+ runpath_var='LD_RUN_PATH'
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 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 ${wl}$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
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var=no
;;
- sysv5*)
- no_undefined_flag=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- 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'
- hardcode_libdir_flag_spec=
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag='${wl}-z,text'
+ allow_undefined_flag='${wl}-z,nodefs'
+ archive_cmds_need_lc=no
hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+ export_dynamic_flag_spec='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
;;
uts4*)
@@ -7014,11 +7291,6 @@
echo "${ECHO_T}$ld_shlibs" >&6
test "$ld_shlibs" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
#
# Do we need to explicitly link libc?
#
@@ -7051,6 +7323,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
compiler_flags=-v
linker_flags=-v
verstring=
@@ -7183,7 +7456,7 @@
shlibpath_var=LIBRARY_PATH
;;
-bsdi4*)
+bsdi[45]*)
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -7211,7 +7484,8 @@
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'
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
@@ -7241,7 +7515,7 @@
;;
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
;;
@@ -7264,7 +7538,7 @@
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)'
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -7299,8 +7573,17 @@
dynamic_linker='GNU ld.so'
;;
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -7318,14 +7601,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
- freebsd3.01* | freebsdelf3.01*)
+ freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
- *) # from 3.2 on
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
@@ -7345,7 +7633,7 @@
version_type=sunos
need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
@@ -7385,6 +7673,18 @@
postinstall_cmds='chmod 555 $lib'
;;
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
@@ -7444,7 +7744,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -7518,8 +7818,13 @@
openbsd*)
version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=yes
+ # 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
@@ -7557,13 +7862,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
-sco3.2v5*)
- version_type=osf
- 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
- ;;
-
solaris*)
version_type=linux
need_lib_prefix=no
@@ -7589,7 +7887,7 @@
need_version=yes
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -7622,6 +7920,29 @@
fi
;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -7637,12 +7958,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var " || \
- test "X$hardcode_automatic"="Xyes" ; then
+ test -n "$runpath_var" || \
+ test "X$hardcode_automatic" = "Xyes" ; then
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
@@ -8285,7 +8611,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -8301,7 +8627,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8304 "configure"
+#line 8630 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8358,6 +8684,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
+ else
+ puts (dlerror ());
exit (status);
}
@@ -8367,12 +8695,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
+ (./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
esac
else :
# compilation failed
@@ -8387,7 +8715,7 @@
echo "${ECHO_T}$lt_cv_dlopen_self" >&6
if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
if test "${lt_cv_dlopen_self_static+set}" = set; then
@@ -8399,7 +8727,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8402 "configure"
+#line 8730 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8456,6 +8784,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
+ else
+ puts (dlerror ());
exit (status);
}
@@ -8465,12 +8795,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
+ (./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
esac
else :
# compilation failed
@@ -8503,7 +8833,7 @@
fi
-# Report which librarie types wil actually be built
+# Report which library types will actually be built
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $can_build_shared" >&5
@@ -8515,7 +8845,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
+case $host_os in
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
@@ -8528,43 +8858,6 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
- ;;
- darwin* | rhapsody*)
- if test "$GCC" = yes; then
- archive_cmds_need_lc=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
- allow_undefined_flag='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag='-undefined dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- output_verbose_link_cmd='echo'
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- hardcode_direct=no
- hardcode_automatic=yes
- hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec='-all_load $convenience'
- link_all_deplibs=yes
- else
- ld_shlibs=no
- fi
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -8590,7 +8883,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -8694,7 +8987,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -8705,11 +8998,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
# The names of the tagged configurations supported by this script.
available_tags=
@@ -8739,6 +9032,12 @@
# The host system.
host_alias=$host_alias
host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
# An echo program that does not interpret backslashes.
echo=$lt_echo
@@ -8750,6 +9049,9 @@
# A C compiler.
LTCC=$lt_LTCC
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
# A language-specific compiler.
CC=$lt_compiler
@@ -8815,7 +9117,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
@@ -9080,6 +9382,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
+ if test -z "$LTCFLAGS"; then
+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+ fi
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
@@ -9110,7 +9415,9 @@
case $tagname in
CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9130,6 +9437,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
@@ -9147,7 +9455,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
# Object file extension for compiled C++ test sources.
objext=o
@@ -9157,17 +9465,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
@@ -9178,18 +9503,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
- unset lt_cv_prog_gnu_ld
+ $as_unset lt_cv_prog_gnu_ld
fi
if test -n "${lt_cv_path_LDCXX+set}"; then
lt_cv_path_LD=$lt_cv_path_LDCXX
else
- unset lt_cv_path_LD
+ $as_unset lt_cv_path_LD
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
@@ -9260,7 +9594,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # 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 </dev/null` in
*GNU* | *'with BFD'*)
@@ -9294,7 +9628,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
@@ -9385,6 +9719,7 @@
;;
esac
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -9403,7 +9738,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
- case $host_os in aix4.012|aix4.012.*)
+ 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`
@@ -9422,8 +9757,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
+ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -9500,12 +9839,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_CXX="-z nodefs"
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
@@ -9564,16 +9903,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols_CXX=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_CXX=' '
+ whole_archive_flag_spec_CXX='$convenience'
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
+
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ allow_undefined_flag_CXX=unsupported
+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs_CXX=no
+ fi
+ ;;
+
chorus*)
case $cc_basename in
*)
@@ -9592,7 +9941,7 @@
enable_shared_with_static_runtimes_CXX=yes
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -9601,70 +9950,81 @@
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}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs_CXX=no
fi
;;
-
- darwin* | rhapsody*)
- if test "$GXX" = yes; then
- archive_cmds_need_lc_CXX=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_CXX='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_CXX='-undefined dynamic_lookup'
- ;;
+ darwin* | rhapsody*)
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+ ;;
+ *) # Darwin 1.3 on
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ else
+ case ${MACOSX_DEPLOYMENT_TARGET} in
+ 10.[012])
+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ ;;
+ 10.*)
+ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+ ;;
+ esac
+ fi
+ ;;
esac
- fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -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'
- fi
- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ archive_cmds_need_lc_CXX=no
+ hardcode_direct_CXX=no
+ hardcode_automatic_CXX=yes
+ hardcode_shlibpath_var_CXX=unsupported
+ whole_archive_flag_spec_CXX=''
+ link_all_deplibs_CXX=yes
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- hardcode_direct_CXX=no
- hardcode_automatic_CXX=yes
- hardcode_shlibpath_var_CXX=unsupported
- whole_archive_flag_spec_CXX='-all_load $convenience'
- link_all_deplibs_CXX=yes
- else
- ld_shlibs_CXX=no
- fi
- ;;
+ if test "$GXX" = yes ; then
+ lt_int_apple_cc_single_mod=no
+ output_verbose_link_cmd='echo'
+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+ lt_int_apple_cc_single_mod=yes
+ fi
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ else
+ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ fi
+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+ ld_shlibs_CXX=no
+ ;;
+ esac
+ fi
+ ;;
dgux*)
case $cc_basename in
- ec++)
+ ec++*)
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- ghcx)
+ ghcx*)
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
@@ -9675,14 +10035,14 @@
;;
esac
;;
- freebsd12*)
+ freebsd[12]*)
# C++ shared libraries reported to be fairly broken before switch to ELF
ld_shlibs_CXX=no
;;
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
@@ -9699,11 +10059,11 @@
# location of the library.
case $cc_basename in
- CC)
+ CC*)
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- aCC)
+ aCC*)
archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -9713,7 +10073,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $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; echo $list'
;;
*)
if test "$GXX" = yes; then
@@ -9727,33 +10087,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
- hardcode_libdir_separator_CXX=:
- ;;
- ia64*)
- hardcode_libdir_flag_spec_CXX='-L$libdir'
;;
*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
export_dynamic_flag_spec_CXX='${wl}-E'
;;
esac
fi
- case "$host_cpu" in
- hppa*64*)
- hardcode_direct_CXX=no
- hardcode_shlibpath_var_CXX=no
- ;;
- ia64*)
+ case $host_cpu in
+ hppa*64*|ia64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
- hardcode_minus_L_CXX=yes # Not in the search PATH,
- # but as the default
- # location of the library.
;;
*)
hardcode_direct_CXX=yes
@@ -9764,14 +10113,17 @@
esac
case $cc_basename in
- CC)
+ CC*)
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- aCC)
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ aCC*)
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -9790,9 +10142,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
- case "$host_cpu" in
- ia64*|hppa*64*)
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -9806,11 +10161,25 @@
;;
esac
;;
+ interix3*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
irix5* | irix6*)
case $cc_basename in
- CC)
+ CC*)
# SGI C++
- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -9821,7 +10190,7 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
@@ -9834,7 +10203,7 @@
;;
linux*)
case $cc_basename in
- KCC)
+ KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
@@ -9859,17 +10228,41 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
- icpc)
+ icpc*)
# Intel C++
with_gnu_ld=yes
+ # version 8.0 and above of icpc choke on multiply defined symbols
+ # if we add $predep_objects and $postdep_objects, however 7.1 and
+ # earlier do not add the objects themselves.
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
+ case $host_cpu in
+ ia64*) tmp_idyn=' -i_dynamic';;
+ esac
+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ esac
archive_cmds_need_lc_CXX=no
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
+ pgCC*)
+ # Portland Group C++ compiler
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
# Compaq C++
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -9900,7 +10293,7 @@
;;
mvs*)
case $cc_basename in
- cxx)
+ cxx*)
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -9921,9 +10314,25 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
+ openbsd2*)
+ # C++ shared libraries are fairly broken
+ ld_shlibs_CXX=no
+ ;;
+ openbsd*)
+ hardcode_direct_CXX=yes
+ hardcode_shlibpath_var_CXX=no
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd='echo'
+ ;;
osf3*)
case $cc_basename in
- KCC)
+ KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
@@ -9939,14 +10348,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
- RCC)
+ RCC*)
# Rational C++ 2.4.1
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- cxx)
+ cxx*)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
@@ -9964,7 +10373,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
@@ -9983,7 +10392,7 @@
;;
osf4* | osf5*)
case $cc_basename in
- KCC)
+ KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
@@ -9998,17 +10407,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
- RCC)
+ RCC*)
# Rational C++ 2.4.1
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- cxx)
+ cxx*)
allow_undefined_flag_CXX=' -expect_unresolved \*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -10027,7 +10436,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
@@ -10048,27 +10457,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- sco*)
- archive_cmds_need_lc_CXX=no
- case $cc_basename in
- CC)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- esac
- ;;
sunos4*)
case $cc_basename in
- CC)
+ CC*)
# Sun C++ 4.x
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- lcc)
+ lcc*)
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
@@ -10081,36 +10477,33 @@
;;
solaris*)
case $cc_basename in
- CC)
+ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
+ archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${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'
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
case $host_os in
- solaris2.0-5 | solaris2.0-5.*) ;;
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The C++ compiler is used as linker so we must use $wl
# flag to pass the commands to the underlying system
- # linker.
+ # linker. We must also pass each convience library through
+ # to the system linker between allextract/defaultextract.
+ # The C++ compiler will combine linker options so we
+ # cannot just pass the convience library names through
+ # without $wl.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
;;
esac
link_all_deplibs_CXX=yes
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ output_verbose_link_cmd='echo'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -10118,7 +10511,7 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
- gcx)
+ gcx*)
# Green Hills C++ Compiler
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
@@ -10156,12 +10549,63 @@
;;
esac
;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_CXX='${wl}-z,text'
+ archive_cmds_need_lc_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ # So that behaviour is only enabled if SCOABSPATH is set to a
+ # non-empty value in the environment. Most likely only useful for
+ # creating official distributions of packages.
+ # This is a hack until libtool officially supports absolute path
+ # names for shared libraries.
+ no_undefined_flag_CXX='${wl}-z,text'
+ allow_undefined_flag_CXX='${wl}-z,nodefs'
archive_cmds_need_lc_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator_CXX=':'
+ link_all_deplibs_CXX=yes
+ export_dynamic_flag_spec_CXX='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
;;
tandem*)
case $cc_basename in
- NCC)
+ NCC*)
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
@@ -10214,7 +10658,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
for p in `eval $output_verbose_link_cmd`; do
case $p in
@@ -10290,10 +10734,33 @@
$rm -f confest.$objext
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
-
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix3*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ predep_objects_CXX=
+ postdep_objects_CXX=
+ postdeps_CXX=
+ ;;
+
+solaris*)
+ case $cc_basename in
+ CC*)
+ # 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.
+ postdeps_CXX='-lCstd -lCrun'
+ ;;
+ esac
+ ;;
+esac
+
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+
lt_prog_compiler_wl_CXX=
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -10337,6 +10804,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
@@ -10345,7 +10816,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
;;
*)
@@ -10370,18 +10841,28 @@
;;
chorus*)
case $cc_basename in
- cxch68)
+ cxch68*)
# Green Hills C++ Compiler
# _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
;;
esac
;;
+ darwin*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ case $cc_basename in
+ xlc*)
+ lt_prog_compiler_pic_CXX='-qnocommon'
+ lt_prog_compiler_wl_CXX='-Wl,'
+ ;;
+ esac
+ ;;
dgux*)
case $cc_basename in
- ec++)
+ ec++*)
lt_prog_compiler_pic_CXX='-KPIC'
;;
- ghcx)
+ ghcx*)
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
@@ -10389,22 +10870,22 @@
;;
esac
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
case $cc_basename in
- CC)
+ CC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
if test "$host_cpu" != ia64; then
lt_prog_compiler_pic_CXX='+Z'
fi
;;
- aCC)
+ aCC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- case "$host_cpu" in
+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -10417,9 +10898,13 @@
;;
esac
;;
+ interix*)
+ # This is c89, which is MS Visual C++ (no shared libs)
+ # Anyone wants to do a port?
+ ;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
- CC)
+ CC*)
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
@@ -10430,18 +10915,24 @@
;;
linux*)
case $cc_basename in
- KCC)
+ KCC*)
# KAI C++ Compiler
lt_prog_compiler_wl_CXX='--backend -Wl,'
lt_prog_compiler_pic_CXX='-fPIC'
;;
- icpc)
+ icpc* | ecpc*)
# Intel C++
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
- cxx)
+ pgCC*)
+ # Portland Group C++ compiler.
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-fpic'
+ lt_prog_compiler_static_CXX='-Bstatic'
+ ;;
+ cxx*)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
@@ -10458,7 +10949,7 @@
;;
mvs*)
case $cc_basename in
- cxx)
+ cxx*)
lt_prog_compiler_pic_CXX='-W c,exportall'
;;
*)
@@ -10469,14 +10960,14 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
- KCC)
+ KCC*)
lt_prog_compiler_wl_CXX='--backend -Wl,'
;;
- RCC)
+ RCC*)
# Rational C++ 2.4.1
lt_prog_compiler_pic_CXX='-pic'
;;
- cxx)
+ cxx*)
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
@@ -10490,24 +10981,15 @@
;;
psos*)
;;
- sco*)
- case $cc_basename in
- CC)
- lt_prog_compiler_pic_CXX='-fPIC'
- ;;
- *)
- ;;
- esac
- ;;
solaris*)
case $cc_basename in
- CC)
+ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-Bstatic'
lt_prog_compiler_wl_CXX='-Qoption ld '
;;
- gcx)
+ gcx*)
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
@@ -10517,12 +10999,12 @@
;;
sunos4*)
case $cc_basename in
- CC)
+ CC*)
# Sun C++ 4.x
lt_prog_compiler_pic_CXX='-pic'
lt_prog_compiler_static_CXX='-Bstatic'
;;
- lcc)
+ lcc*)
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
@@ -10532,7 +11014,7 @@
;;
tandem*)
case $cc_basename in
- NCC)
+ NCC*)
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
@@ -10540,7 +11022,14 @@
;;
esac
;;
- unixware*)
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ case $cc_basename in
+ CC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-Bstatic'
+ ;;
+ esac
;;
vxworks*)
;;
@@ -10573,18 +11062,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10579: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11068: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10583: \$? = $ac_status" >&5
+ echo "$as_me:11072: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_CXX=yes
fi
fi
@@ -10605,7 +11096,7 @@
fi
fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
@@ -10615,6 +11106,48 @@
;;
esac
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_static_works_CXX=yes
+ fi
+ else
+ lt_prog_compiler_static_works_CXX=yes
+ fi
+ fi
+ $rm conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
+
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+ :
+else
+ lt_prog_compiler_static_CXX=
+fi
+
+
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
@@ -10633,23 +11166,25 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10639: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11172: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10643: \$? = $ac_status" >&5
+ echo "$as_me:11176: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- if test ! -s out/conftest.err; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
fi
fi
- chmod u+w .
+ chmod u+w . 2>&5
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
@@ -10704,7 +11239,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ kfreebsd*-gnu)
+ link_all_deplibs_CXX=no
;;
linux*)
link_all_deplibs_CXX=no
@@ -10718,11 +11256,6 @@
echo "${ECHO_T}$ld_shlibs_CXX" >&6
test "$ld_shlibs_CXX" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
#
# Do we need to explicitly link libc?
#
@@ -10755,6 +11288,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
+ pic_flag=$lt_prog_compiler_pic_CXX
compiler_flags=-v
linker_flags=-v
verstring=
@@ -10887,7 +11421,7 @@
shlibpath_var=LIBRARY_PATH
;;
-bsdi4*)
+bsdi[45]*)
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10915,7 +11449,8 @@
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'
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
@@ -10945,7 +11480,7 @@
;;
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
;;
@@ -10968,7 +11503,7 @@
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)'
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -11003,8 +11538,17 @@
dynamic_linker='GNU ld.so'
;;
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -11022,14 +11566,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
- freebsd3.01* | freebsdelf3.01*)
+ freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
- *) # from 3.2 on
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
@@ -11049,7 +11598,7 @@
version_type=sunos
need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
@@ -11089,6 +11638,18 @@
postinstall_cmds='chmod 555 $lib'
;;
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
@@ -11148,7 +11709,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -11222,8 +11783,13 @@
openbsd*)
version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=yes
+ # 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
@@ -11261,13 +11827,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
-sco3.2v5*)
- version_type=osf
- 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
- ;;
-
solaris*)
version_type=linux
need_lib_prefix=no
@@ -11293,7 +11852,7 @@
need_version=yes
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -11326,6 +11885,29 @@
fi
;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11341,12 +11923,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
- test -n "$runpath_var CXX" || \
- test "X$hardcode_automatic_CXX"="Xyes" ; then
+ test -n "$runpath_var_CXX" || \
+ test "X$hardcode_automatic_CXX" = "Xyes" ; then
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
@@ -11378,1221 +11965,402 @@
enable_fast_install=needless
fi
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+ # See if we are running on zsh, and set the options which allow our commands through
+ # without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+ # Now quote all the things that may contain metacharacters while being
+ # careful not to overquote the AC_SUBSTed values. We take copies of the
+ # variables and quote the copies for generation of the libtool script.
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+ deplibs_check_method reload_flag reload_cmds need_locks \
+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+ lt_cv_sys_global_symbol_to_c_name_address \
+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+ old_postinstall_cmds old_postuninstall_cmds \
+ compiler_CXX \
+ CC_CXX \
+ LD_CXX \
+ lt_prog_compiler_wl_CXX \
+ lt_prog_compiler_pic_CXX \
+ lt_prog_compiler_static_CXX \
+ lt_prog_compiler_no_builtin_flag_CXX \
+ export_dynamic_flag_spec_CXX \
+ thread_safe_flag_spec_CXX \
+ whole_archive_flag_spec_CXX \
+ enable_shared_with_static_runtimes_CXX \
+ old_archive_cmds_CXX \
+ old_archive_from_new_cmds_CXX \
+ predep_objects_CXX \
+ postdep_objects_CXX \
+ predeps_CXX \
+ postdeps_CXX \
+ compiler_lib_search_path_CXX \
+ archive_cmds_CXX \
+ archive_expsym_cmds_CXX \
+ postinstall_cmds_CXX \
+ postuninstall_cmds_CXX \
+ old_archive_from_expsyms_cmds_CXX \
+ allow_undefined_flag_CXX \
+ no_undefined_flag_CXX \
+ export_symbols_cmds_CXX \
+ hardcode_libdir_flag_spec_CXX \
+ hardcode_libdir_flag_spec_ld_CXX \
+ hardcode_libdir_separator_CXX \
+ hardcode_automatic_CXX \
+ module_cmds_CXX \
+ module_expsym_cmds_CXX \
+ lt_cv_prog_compiler_c_o_CXX \
+ exclude_expsyms_CXX \
+ include_expsyms_CXX; do
+
+ case $var in
+ old_archive_cmds_CXX | \
+ old_archive_from_new_cmds_CXX | \
+ archive_cmds_CXX | \
+ archive_expsym_cmds_CXX | \
+ module_cmds_CXX | \
+ module_expsym_cmds_CXX | \
+ old_archive_from_expsyms_cmds_CXX | \
+ export_symbols_cmds_CXX | \
+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
+ postinstall_cmds | postuninstall_cmds | \
+ old_postinstall_cmds | old_postuninstall_cmds | \
+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+ # Double-quote double-evaled strings.
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+ ;;
+ *)
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+ ;;
+ esac
+ done
+
+ case $lt_echo in
+ *'\$0 --fallback-echo"')
+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
;;
esac
-fi
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
+cfgfile="$ofile"
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
+ cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
- darwin*)
- # if libdl is installed we need to link against it
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-fi
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
- ;;
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
- *)
- echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
-#undef shl_load
+# A C compiler.
+LTCC=$lt_LTCC
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
-int
-main ()
-{
-return f != shl_load;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# A language-specific compiler.
+CC=$lt_compiler_CXX
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
-else
- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dld_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# An ERE matcher.
+EGREP=$lt_EGREP
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
- echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
+# The linker used to build libraries.
+LD=$lt_LD_CXX
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+# A BSD-compatible nm program.
+NM=$lt_NM
-#undef dlopen
+# A symbol stripping program
+STRIP=$lt_STRIP
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
-int
-main ()
-{
-return f != dlopen;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
-else
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Used on cygwin: assembler.
+AS="$AS"
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_svld_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dld_dld_link=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Object file suffix (normally "o").
+objext="$ac_objext"
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
+# Old archive suffix (normally "a").
+libext="$libext"
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
-fi
+# Executable file suffix (normally "").
+exeext="$exeext"
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+pic_mode=$pic_mode
-fi
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-fi
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
-fi
+# Do we need a version for libraries?
+need_version=$need_version
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
-fi
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
- ;;
- esac
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 12008 "configure"
-#include "confdefs.h"
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+# Library versioning type.
+version_type=$version_type
-#include <stdio.h>
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_CXX
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
- fi
-fi
-rm -fr conftest*
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 12106 "configure"
-#include "confdefs.h"
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_CXX
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_CXX
-#include <stdio.h>
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_CXX
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_CXX
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
- fi
-fi
-rm -fr conftest*
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler_CXX \
- CC_CXX \
- LD_CXX \
- lt_prog_compiler_wl_CXX \
- lt_prog_compiler_pic_CXX \
- lt_prog_compiler_static_CXX \
- lt_prog_compiler_no_builtin_flag_CXX \
- export_dynamic_flag_spec_CXX \
- thread_safe_flag_spec_CXX \
- whole_archive_flag_spec_CXX \
- enable_shared_with_static_runtimes_CXX \
- old_archive_cmds_CXX \
- old_archive_from_new_cmds_CXX \
- predep_objects_CXX \
- postdep_objects_CXX \
- predeps_CXX \
- postdeps_CXX \
- compiler_lib_search_path_CXX \
- archive_cmds_CXX \
- archive_expsym_cmds_CXX \
- postinstall_cmds_CXX \
- postuninstall_cmds_CXX \
- old_archive_from_expsyms_cmds_CXX \
- allow_undefined_flag_CXX \
- no_undefined_flag_CXX \
- export_symbols_cmds_CXX \
- hardcode_libdir_flag_spec_CXX \
- hardcode_libdir_flag_spec_ld_CXX \
- hardcode_libdir_separator_CXX \
- hardcode_automatic_CXX \
- module_cmds_CXX \
- module_expsym_cmds_CXX \
- lt_cv_prog_compiler_c_o_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
- case $var in
- old_archive_cmds_CXX | \
- old_archive_from_new_cmds_CXX | \
- archive_cmds_CXX | \
- archive_expsym_cmds_CXX | \
- module_cmds_CXX | \
- module_expsym_cmds_CXX | \
- old_archive_from_expsyms_cmds_CXX | \
- export_symbols_cmds_CXX | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-cfgfile="$ofile"
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_CXX
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_CXX
-# The host system.
-host_alias=$host_alias
-host=$host
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# A C compiler.
-LTCC=$lt_LTCC
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-# A language-specific compiler.
-CC=$lt_compiler_CXX
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_CXX"
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
-# An ERE matcher.
-EGREP=$lt_EGREP
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
-# The linker used to build libraries.
-LD=$lt_LD_CXX
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
-# A BSD-compatible nm program.
-NM=$lt_NM
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
-# A symbol stripping program
-STRIP=$lt_STRIP
+# ### END LIBTOOL TAG CONFIG: $tagname
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
+__EOF__
else
@@ -12674,16 +12442,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
CC=${F77-"f77"}
compiler=$CC
compiler_F77=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
@@ -12696,7 +12490,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
+case $host_os in
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
@@ -12705,7 +12499,9 @@
fi
;;
aix4* | aix5*)
- test "$enable_shared" = yes && enable_static=no
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -12718,8 +12514,6 @@
echo "$as_me:$LINENO: result: $enable_static" >&5
echo "${ECHO_T}$enable_static" >&6
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
GCC_F77="$G77"
LD_F77="$LD"
@@ -12766,6 +12560,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
@@ -12782,7 +12581,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -12808,6 +12607,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
+ darwin*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ case $cc_basename in
+ xlc*)
+ lt_prog_compiler_pic_F77='-qnocommon'
+ lt_prog_compiler_wl_F77='-Wl,'
+ ;;
+ esac
+ ;;
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
@@ -12819,7 +12628,7 @@
lt_prog_compiler_wl_F77='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -12843,12 +12652,19 @@
;;
linux*)
- case $CC in
+ case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-static'
;;
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-fpic'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
@@ -12863,15 +12679,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
- sco3.2v5*)
- lt_prog_compiler_pic_F77='-Kpic'
- lt_prog_compiler_static_F77='-dn'
- ;;
-
solaris*)
- lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
+ case $cc_basename in
+ f77* | f90* | f95*)
+ lt_prog_compiler_wl_F77='-Qoption ld ';;
+ *)
+ lt_prog_compiler_wl_F77='-Wl,';;
+ esac
;;
sunos4*)
@@ -12880,7 +12696,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
@@ -12893,6 +12709,17 @@
fi
;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
+ unicos*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_can_build_shared_F77=no
+ ;;
+
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
@@ -12927,18 +12754,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12933: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12760: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12937: \$? = $ac_status" >&5
+ echo "$as_me:12764: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_F77=yes
fi
fi
@@ -12959,7 +12788,7 @@
fi
fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
@@ -12969,6 +12798,48 @@
;;
esac
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_static_works_F77=yes
+ fi
+ else
+ lt_prog_compiler_static_works_F77=yes
+ fi
+ fi
+ $rm conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
+
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+ :
+else
+ lt_prog_compiler_static_F77=
+fi
+
+
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
@@ -12987,23 +12858,25 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12993: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12864: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12997: \$? = $ac_status" >&5
+ echo "$as_me:12868: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- if test ! -s out/conftest.err; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_F77=yes
fi
fi
- chmod u+w .
+ chmod u+w . 2>&5
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
@@ -13079,6 +12952,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
case $host_os in
cygwin* | mingw* | pw32*)
@@ -13089,6 +12972,10 @@
with_gnu_ld=no
fi
;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
openbsd*)
with_gnu_ld=no
;;
@@ -13099,6 +12986,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+ export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec_F77=
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>/dev/null` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+ *\ 2.11.*) ;; # other 2.11 versions
+ *) supports_anon_versioning=yes ;;
+ esac
+
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
@@ -13149,10 +13057,10 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -13161,9 +13069,56 @@
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}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $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
+ ld_shlibs_F77=no
+ fi
+ ;;
+
+ interix3*)
+ hardcode_direct_F77=no
+ hardcode_shlibpath_var_F77=no
+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_F77='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+ archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
fi
;;
@@ -13177,7 +13132,7 @@
fi
;;
- solaris* | sysv5*)
+ solaris*)
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
@@ -13198,6 +13153,33 @@
fi
;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs_F77=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+ else
+ ld_shlibs_F77=no
+ fi
+ ;;
+ esac
+ ;;
+
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
@@ -13205,32 +13187,6 @@
hardcode_shlibpath_var_F77=no
;;
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_cmds_F77="$tmp_archive_cmds"
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- archive_expsym_cmds_F77="$tmp_archive_cmds"
- fi
- link_all_deplibs_F77=no
- else
- ld_shlibs_F77=no
- fi
- ;;
-
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -13241,16 +13197,11 @@
;;
esac
- if test "$ld_shlibs_F77" = yes; then
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_F77='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec_F77=
- fi
+ if test "$ld_shlibs_F77" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec_F77=
+ export_dynamic_flag_spec_F77=
+ whole_archive_flag_spec_F77=
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
@@ -13262,7 +13213,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
@@ -13296,6 +13247,7 @@
break
fi
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -13314,7 +13266,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
- case $host_os in aix4.012|aix4.012.*)
+ 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`
@@ -13333,8 +13285,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
+ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -13342,11 +13298,11 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+ if test "$aix_use_runtimelinking" = yes; then
shared_flag='${wl}-G'
else
shared_flag='${wl}-bM:SRE'
- fi
+ fi
fi
fi
@@ -13400,12 +13356,12 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_F77="-z nodefs"
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
@@ -13454,13 +13410,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols_F77=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_F77=' '
+ whole_archive_flag_spec_F77='$convenience'
archive_cmds_need_lc_F77=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -13473,7 +13427,7 @@
ld_shlibs_F77=no
;;
- bsdi4*)
+ bsdi[45]*)
export_dynamic_flag_spec_F77=-rdynamic
;;
@@ -13494,57 +13448,57 @@
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
- archive_cmds_need_lc_F77=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_F77='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_F77='-undefined dynamic_lookup'
- ;;
- esac
- fi
- ;;
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
+ ;;
+ *) # Darwin 1.3 on
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ else
+ case ${MACOSX_DEPLOYMENT_TARGET} in
+ 10.[012])
+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ ;;
+ 10.*)
+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
+ ;;
+ esac
+ fi
+ ;;
esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds_F77='$CC -r ${wl}-bind_at_load -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'
- fi
- module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_cmds_need_lc_F77=no
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
- whole_archive_flag_spec_F77='-all_load $convenience'
+ whole_archive_flag_spec_F77=''
link_all_deplibs_F77=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
- ld_shlibs_F77=no
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+ ld_shlibs_F77=no
+ ;;
+ esac
fi
;;
@@ -13578,13 +13532,22 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd* | dragonfly*)
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
;;
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+ kfreebsd*-gnu)
+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec_F77='-R$libdir'
+ hardcode_direct_F77=yes
+ hardcode_shlibpath_var_F77=no
+ link_all_deplibs_F77=no
+ ;;
+
hpux9*)
if test "$GCC" = yes; then
archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -13601,47 +13564,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
- hpux10* | hpux11*)
+ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_F77=:
+
+ hardcode_direct_F77=yes
+ export_dynamic_flag_spec_F77='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L_F77=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
+ ia64*)
+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_F77=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
- hardcode_libdir_separator_F77=:
- hardcode_direct_F77=no
- hardcode_shlibpath_var_F77=no
- ;;
- ia64*)
- hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_F77=yes
;;
*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_F77=:
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
@@ -13689,6 +13667,7 @@
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
@@ -13734,7 +13713,7 @@
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
@@ -13742,21 +13721,15 @@
hardcode_libdir_separator_F77=:
;;
- sco3.2v5*)
- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_F77=no
- export_dynamic_flag_spec_F77='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
+ wlarc='${wl}'
archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
+ wlarc=''
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -13765,8 +13738,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+ *)
+ # The compiler driver will combine linker options so we
+ # cannot just pass the convience library names through
+ # without $wl, iff we do not link with $LD.
+ # Luckily, gcc supports the same syntax we need for Sun Studio.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ case $wlarc in
+ '')
+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+ *)
+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ esac ;;
esac
link_all_deplibs_F77=yes
;;
@@ -13823,36 +13806,45 @@
fi
;;
- sysv4.2uw2*)
- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_F77=yes
- hardcode_minus_L_F77=no
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ no_undefined_flag_F77='${wl}-z,text'
+ archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
+ runpath_var='LD_RUN_PATH'
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_F77=no
;;
- sysv5*)
- no_undefined_flag_F77=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- hardcode_libdir_flag_spec_F77=
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag_F77='${wl}-z,text'
+ allow_undefined_flag_F77='${wl}-z,nodefs'
+ archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator_F77=':'
+ link_all_deplibs_F77=yes
+ export_dynamic_flag_spec_F77='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
;;
uts4*)
@@ -13871,11 +13863,6 @@
echo "${ECHO_T}$ld_shlibs_F77" >&6
test "$ld_shlibs_F77" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
#
# Do we need to explicitly link libc?
#
@@ -13908,6 +13895,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
+ pic_flag=$lt_prog_compiler_pic_F77
compiler_flags=-v
linker_flags=-v
verstring=
@@ -14040,7 +14028,7 @@
shlibpath_var=LIBRARY_PATH
;;
-bsdi4*)
+bsdi[45]*)
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14068,7 +14056,8 @@
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'
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
@@ -14098,7 +14087,7 @@
;;
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
;;
@@ -14121,7 +14110,7 @@
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)'
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -14156,8 +14145,17 @@
dynamic_linker='GNU ld.so'
;;
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -14175,14 +14173,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
- freebsd3.01* | freebsdelf3.01*)
+ freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
- *) # from 3.2 on
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
@@ -14202,7 +14205,7 @@
version_type=sunos
need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
@@ -14242,6 +14245,18 @@
postinstall_cmds='chmod 555 $lib'
;;
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
@@ -14301,7 +14316,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -14375,8 +14390,13 @@
openbsd*)
version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=yes
+ # 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
@@ -14414,13 +14434,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
-sco3.2v5*)
- version_type=osf
- 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
- ;;
-
solaris*)
version_type=linux
need_lib_prefix=no
@@ -14446,7 +14459,7 @@
need_version=yes
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -14479,6 +14492,29 @@
fi
;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14494,12 +14530,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
- test -n "$runpath_var F77" || \
- test "X$hardcode_automatic_F77"="Xyes" ; then
+ test -n "$runpath_var_F77" || \
+ test "X$hardcode_automatic_F77" = "Xyes" ; then
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
@@ -14531,36 +14572,6 @@
enable_fast_install=needless
fi
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
-
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -14575,7 +14586,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -14676,6 +14687,12 @@
# The host system.
host_alias=$host_alias
host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
# An echo program that does not interpret backslashes.
echo=$lt_echo
@@ -14687,6 +14704,9 @@
# A C compiler.
LTCC=$lt_LTCC
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
# A language-specific compiler.
CC=$lt_compiler_F77
@@ -14752,7 +14772,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
@@ -14990,26 +15010,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
CC=${GCJ-"gcj"}
compiler=$CC
compiler_GCJ=$CC
+for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
# GCJ did not exist at the time GCC didn't implicitly link libc in.
archive_cmds_need_lc_GCJ=no
+old_archive_cmds_GCJ=$old_archive_cmds
+
lt_prog_compiler_no_builtin_flag_GCJ=
@@ -15032,18 +15081,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15038: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15087: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15042: \$? = $ac_status" >&5
+ echo "$as_me:15091: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
@@ -15104,6 +15155,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
@@ -15120,7 +15176,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -15146,6 +15202,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
+ darwin*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ case $cc_basename in
+ xlc*)
+ lt_prog_compiler_pic_GCJ='-qnocommon'
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ ;;
+ esac
+ ;;
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
@@ -15157,7 +15223,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -15181,12 +15247,19 @@
;;
linux*)
- case $CC in
+ case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-static'
;;
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_GCJ='-fpic'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ ;;
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
@@ -15201,15 +15274,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
- sco3.2v5*)
- lt_prog_compiler_pic_GCJ='-Kpic'
- lt_prog_compiler_static_GCJ='-dn'
- ;;
-
solaris*)
- lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
+ case $cc_basename in
+ f77* | f90* | f95*)
+ lt_prog_compiler_wl_GCJ='-Qoption ld ';;
+ *)
+ lt_prog_compiler_wl_GCJ='-Wl,';;
+ esac
;;
sunos4*)
@@ -15218,7 +15291,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
@@ -15231,6 +15304,17 @@
fi
;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ ;;
+
+ unicos*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_can_build_shared_GCJ=no
+ ;;
+
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
@@ -15265,18 +15349,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15271: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15355: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15275: \$? = $ac_status" >&5
+ echo "$as_me:15359: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
@@ -15297,7 +15383,7 @@
fi
fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
@@ -15307,6 +15393,48 @@
;;
esac
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_static_works_GCJ=yes
+ fi
+ else
+ lt_prog_compiler_static_works_GCJ=yes
+ fi
+ fi
+ $rm conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
+
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+ :
+else
+ lt_prog_compiler_static_GCJ=
+fi
+
+
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
@@ -15325,23 +15453,25 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15331: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15459: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15335: \$? = $ac_status" >&5
+ echo "$as_me:15463: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- if test ! -s out/conftest.err; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_GCJ=yes
fi
fi
- chmod u+w .
+ chmod u+w . 2>&5
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
@@ -15417,6 +15547,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
case $host_os in
cygwin* | mingw* | pw32*)
@@ -15427,6 +15567,10 @@
with_gnu_ld=no
fi
;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
openbsd*)
with_gnu_ld=no
;;
@@ -15437,6 +15581,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec_GCJ=
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>/dev/null` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+ *\ 2.11.*) ;; # other 2.11 versions
+ *) supports_anon_versioning=yes ;;
+ esac
+
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
@@ -15487,10 +15652,10 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -15499,9 +15664,56 @@
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}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $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
+ ld_shlibs_GCJ=no
+ fi
+ ;;
+
+ interix3*)
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_GCJ='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+ archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
fi
;;
@@ -15515,7 +15727,7 @@
fi
;;
- solaris* | sysv5*)
+ solaris*)
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
@@ -15536,6 +15748,33 @@
fi
;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs_GCJ=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+ else
+ ld_shlibs_GCJ=no
+ fi
+ ;;
+ esac
+ ;;
+
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
@@ -15543,32 +15782,6 @@
hardcode_shlibpath_var_GCJ=no
;;
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_cmds_GCJ="$tmp_archive_cmds"
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- archive_expsym_cmds_GCJ="$tmp_archive_cmds"
- fi
- link_all_deplibs_GCJ=no
- else
- ld_shlibs_GCJ=no
- fi
- ;;
-
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -15579,16 +15792,11 @@
;;
esac
- if test "$ld_shlibs_GCJ" = yes; then
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec_GCJ=
- fi
+ if test "$ld_shlibs_GCJ" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec_GCJ=
+ export_dynamic_flag_spec_GCJ=
+ whole_archive_flag_spec_GCJ=
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
@@ -15600,7 +15808,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
@@ -15634,6 +15842,7 @@
break
fi
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -15652,7 +15861,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
- case $host_os in aix4.012|aix4.012.*)
+ 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`
@@ -15671,8 +15880,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
+ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -15680,11 +15893,11 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+ if test "$aix_use_runtimelinking" = yes; then
shared_flag='${wl}-G'
else
shared_flag='${wl}-bM:SRE'
- fi
+ fi
fi
fi
@@ -15748,12 +15961,12 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_GCJ="-z nodefs"
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
@@ -15812,13 +16025,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols_GCJ=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_GCJ=' '
+ whole_archive_flag_spec_GCJ='$convenience'
archive_cmds_need_lc_GCJ=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -15831,7 +16042,7 @@
ld_shlibs_GCJ=no
;;
- bsdi4*)
+ bsdi[45]*)
export_dynamic_flag_spec_GCJ=-rdynamic
;;
@@ -15852,57 +16063,57 @@
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
+ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
- archive_cmds_need_lc_GCJ=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_GCJ='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_GCJ='-undefined dynamic_lookup'
- ;;
- esac
- fi
- ;;
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
+ ;;
+ *) # Darwin 1.3 on
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ else
+ case ${MACOSX_DEPLOYMENT_TARGET} in
+ 10.[012])
+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ ;;
+ 10.*)
+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
+ ;;
+ esac
+ fi
+ ;;
esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -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'
- fi
- module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_cmds_need_lc_GCJ=no
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
- whole_archive_flag_spec_GCJ='-all_load $convenience'
+ whole_archive_flag_spec_GCJ=''
link_all_deplibs_GCJ=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
- ld_shlibs_GCJ=no
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+ ld_shlibs_GCJ=no
+ ;;
+ esac
fi
;;
@@ -15936,11 +16147,20 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd* | dragonfly*)
+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
+ hardcode_direct_GCJ=yes
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+ kfreebsd*-gnu)
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
+ link_all_deplibs_GCJ=no
;;
hpux9*)
@@ -15959,47 +16179,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
- hpux10* | hpux11*)
+ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_GCJ=:
+
+ hardcode_direct_GCJ=yes
+ export_dynamic_flag_spec_GCJ='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L_GCJ=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
+ ia64*)
+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds_GCJ='$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
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_GCJ=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
- hardcode_libdir_separator_GCJ=:
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
- ;;
- ia64*)
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
;;
*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
@@ -16047,6 +16282,7 @@
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
@@ -16092,7 +16328,7 @@
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
@@ -16100,21 +16336,15 @@
hardcode_libdir_separator_GCJ=:
;;
- sco3.2v5*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_GCJ=no
- export_dynamic_flag_spec_GCJ='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
+ wlarc='${wl}'
archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
+ wlarc=''
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -16123,8 +16353,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+ *)
+ # The compiler driver will combine linker options so we
+ # cannot just pass the convience library names through
+ # without $wl, iff we do not link with $LD.
+ # Luckily, gcc supports the same syntax we need for Sun Studio.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ case $wlarc in
+ '')
+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+ *)
+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ esac ;;
esac
link_all_deplibs_GCJ=yes
;;
@@ -16181,36 +16421,45 @@
fi
;;
- sysv4.2uw2*)
- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=yes
- hardcode_minus_L_GCJ=no
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ no_undefined_flag_GCJ='${wl}-z,text'
+ archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
+ runpath_var='LD_RUN_PATH'
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_GCJ=no
;;
- sysv5*)
- no_undefined_flag_GCJ=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- hardcode_libdir_flag_spec_GCJ=
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag_GCJ='${wl}-z,text'
+ allow_undefined_flag_GCJ='${wl}-z,nodefs'
+ archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator_GCJ=':'
+ link_all_deplibs_GCJ=yes
+ export_dynamic_flag_spec_GCJ='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
;;
uts4*)
@@ -16229,11 +16478,6 @@
echo "${ECHO_T}$ld_shlibs_GCJ" >&6
test "$ld_shlibs_GCJ" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
#
# Do we need to explicitly link libc?
#
@@ -16266,6 +16510,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
+ pic_flag=$lt_prog_compiler_pic_GCJ
compiler_flags=-v
linker_flags=-v
verstring=
@@ -16380,1341 +16625,566 @@
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
- fi
- ;;
-
-amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
-
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
-
-bsdi4*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-
-cygwin* | mingw* | pw32*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
- shlibpath_overrides_runpath=yes
-
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
- ;;
- mingw*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- ;;
-
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-freebsd1*)
- dynamic_linker=no
- ;;
-
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- need_version=no
- need_lib_prefix=no
- ;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.01* | freebsdelf3.01*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- *) # from 3.2 on
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- esac
- ;;
-
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
-
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case "$host_cpu" in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
- version_type=irix
- fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be Linux ELF.
-linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-openbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=yes
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-sco3.2v5*)
- version_type=osf
- 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
- ;;
-
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
- test -n "$runpath_var GCJ" || \
- test "X$hardcode_automatic_GCJ"="Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_GCJ" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
- test "$hardcode_minus_L_GCJ" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_GCJ=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_GCJ=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_GCJ=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
-
-if test "$hardcode_action_GCJ" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-
-fi
-
- ;;
-
- *)
- echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
-else
- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dld_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
- echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
-else
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_svld_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ soname_spec='${libname}${release}${shared_ext}$major'
+ fi
+ shlibpath_var=LIBPATH
+ fi
+ ;;
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+amigaos*)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dld_dld_link=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+beos*)
+ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
+bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+ # the default ld.so.conf also contains /usr/contrib/lib and
+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+ # libtool to hard-code these into programs
+ ;;
+cygwin* | mingw* | pw32*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
-fi
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
+ mingw*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+ # It is most probably a Windows format PATH printed by
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
+ # path with ; separators, and with drive letters. We can handle the
+ # drive letters (cygwin fileutils understands them), so leave them,
+ # especially as we might pass files found there to a mingw objdump,
+ # which wouldn't understand a cygwinified path. Ahh.
+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
-fi
+ *)
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ ;;
+ esac
+ dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+ if test "$GCC" = yes; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+ else
+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+ fi
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
-fi
+dgux*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+freebsd1*)
+ dynamic_linker=no
+ ;;
-fi
+kfreebsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='GNU ld.so'
+ ;;
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ esac
+ ;;
-fi
+gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ ;;
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ case $host_cpu in
+ ia64*)
+ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ if test "X$HPUX_IA64_MODE" = X32; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ fi
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ postinstall_cmds='chmod 555 $lib'
+ ;;
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 17519 "configure"
-#include "confdefs.h"
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux
+ else
+ version_type=irix
+ fi ;;
+ esac
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
+ *)
+ case $LD in # libtool.m4 will add one of these switches to LD
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+ libsuff= shlibsuff= libmagic=32-bit;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+ libsuff=32 shlibsuff=N32 libmagic=N32;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
+ *) libsuff= shlibsuff= libmagic=never-match;;
+ esac
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
-#include <stdio.h>
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
+# This must be Linux ELF.
+linux*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+ # most powerpc-linux boxes support dynamic linking these days and
+ # people can always --disable-shared, the test was removed, and we
+ # assume the GNU/Linux dynamic linker is in use.
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
+knetbsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='GNU ld.so'
+ ;;
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 17617 "configure"
-#include "confdefs.h"
+newsos6)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+nto-qnx*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
-#include <stdio.h>
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ case $host_os in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
+ fi
+ ;;
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
+ ;;
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
+sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+ shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ export_dynamic_flag_spec='${wl}-Blargedynsym'
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
esac
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
fi
-fi
-rm -fr conftest*
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+*)
+ dynamic_linker=no
+ ;;
+esac
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" = no && can_build_shared=no
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_GCJ=
+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+ test -n "$runpath_var_GCJ" || \
+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+ test "$hardcode_minus_L_GCJ" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_GCJ=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_GCJ=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_GCJ=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
+if test "$hardcode_action_GCJ" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
fi
@@ -17731,7 +17201,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -17832,6 +17302,12 @@
# The host system.
host_alias=$host_alias
host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
# An echo program that does not interpret backslashes.
echo=$lt_echo
@@ -17843,6 +17319,9 @@
# A C compiler.
LTCC=$lt_LTCC
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
# A language-specific compiler.
CC=$lt_compiler_GCJ
@@ -17908,7 +17387,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
@@ -18152,15 +17631,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
CC=${RC-"windres"}
compiler=$CC
compiler_RC=$CC
+for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
@@ -18176,7 +17682,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -18277,6 +17783,12 @@
# The host system.
host_alias=$host_alias
host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
# An echo program that does not interpret backslashes.
echo=$lt_echo
@@ -18288,6 +17800,9 @@
# A C compiler.
LTCC=$lt_LTCC
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
# A language-specific compiler.
CC=$lt_compiler_RC
@@ -18353,7 +17868,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
@@ -21237,7 +20752,7 @@
int
main ()
{
-{int x; asm volatile("movl %%eax, %%ebx\n"::
+{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal"::
"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}
;
@@ -22408,7 +21923,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -22435,7 +21950,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -22449,18 +21964,18 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
@@ -22498,7 +22013,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
+ if test -r $ac_dir/libX11.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
@@ -26267,7 +25782,9 @@
fi;
-appspath=$with_gnustepdir
+if test "x`echo $with_gnustepdir | grep ^/`" != "x"; then
+ appspath=$with_gnustepdir
+fi
if test "x$appspath$GNUSTEP_LOCAL_ROOT" = "x"; then
wprefs_base_dir=${prefix}
diff -uhrN WindowMaker-0.92.0/configure.ac WindowMaker-CVS-20060123/configure.ac
--- WindowMaker-0.92.0/configure.ac 2005-01-06 16:31:40.000000000 +0100
+++ WindowMaker-CVS-20060123/configure.ac 2005-08-22 23:48:20.000000000 +0200
@@ -197,7 +197,7 @@
AC_CACHE_CHECK(whether gcc supports x86 inline asm,
ac_cv_c_inline_asm,
- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n"::
+ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal"::
"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}],
ac_cv_c_inline_asm=yes,
@@ -831,7 +831,9 @@
AC_ARG_WITH(appspath,
[ --with-gnustepdir=PATH specify the directory for GNUstep applications])
-appspath=$with_gnustepdir
+if test "x`echo $with_gnustepdir | grep ^/`" != "x"; then
+ appspath=$with_gnustepdir
+fi
if test "x$appspath$GNUSTEP_LOCAL_ROOT" = "x"; then
wprefs_base_dir=${prefix}
diff -uhrN WindowMaker-0.92.0/ltmain.sh WindowMaker-CVS-20060123/ltmain.sh
--- WindowMaker-0.92.0/ltmain.sh 2005-06-19 05:22:56.000000000 +0200
+++ WindowMaker-CVS-20060123/ltmain.sh 2006-01-09 16:21:15.000000000 +0100
@@ -1,7 +1,7 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
@@ -17,7 +17,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -43,9 +43,14 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
+VERSION="1.5.22 Debian 1.5.22-2"
+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes.
+if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
@@ -83,14 +88,15 @@
Xsed="${SED}"' -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
- SP2NL="tr '\100' '\n'"
- NL2SP="tr '\r\n' '\100\100'"
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+ SP2NL='tr \040 \012'
+ NL2SP='tr \015\012 \040\040'
;;
- *) # Assume ASCII based system
- SP2NL="tr '\040' '\012'"
- NL2SP="tr '\015\012' '\040\040'"
+ *) # EBCDIC based system
+ SP2NL='tr \100 \n'
+ NL2SP='tr \r\n \100\100'
;;
esac
@@ -107,8 +113,9 @@
fi
# Make sure IFS has a sensible default
-: ${IFS="
-"}
+lt_nl='
+'
+IFS=" $lt_nl"
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
$echo "$modename: not configured to build any kind of library" 1>&2
@@ -125,6 +132,8 @@
show="$echo"
show_help=
execute_dlfiles=
+duplicate_deps=no
+preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
@@ -132,13 +141,51 @@
# Shell function definitions:
# This seems to be the best place for them
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible. If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+ my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+ if test "$run" = ":"; then
+ # Return a directory name, but don't create it in dry-run mode
+ my_tmpdir="${my_template}-$$"
+ else
+
+ # If mktemp works, use that first and foremost
+ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+ if test ! -d "$my_tmpdir"; then
+ # Failing that, at least try and use $RANDOM to avoid a race
+ my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+ save_mktempdir_umask=`umask`
+ umask 0077
+ $mkdir "$my_tmpdir"
+ umask $save_mktempdir_umask
+ fi
+
+ # If we're not in dry-run mode, bomb out on failure
+ test -d "$my_tmpdir" || {
+ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+ exit $EXIT_FAILURE
+ }
+ fi
+
+ $echo "X$my_tmpdir" | $Xsed
+}
+
+
# func_win32_libid arg
# return the library type of file 'arg'
#
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
-func_win32_libid () {
+func_win32_libid ()
+{
win32_libid_type="unknown"
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
@@ -149,12 +196,11 @@
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
- if test "X$win32_nmres" = "Ximport" ; then
- win32_libid_type="x86 archive import"
- else
- win32_libid_type="x86 archive static"
- fi
+ $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+ case $win32_nmres in
+ import*) win32_libid_type="x86 archive import";;
+ *) win32_libid_type="x86 archive static";;
+ esac
fi
;;
*DLL*)
@@ -178,7 +224,8 @@
# Only attempt this if the compiler in the base compile
# command doesn't match the default compiler.
# arg is usually of the form 'gcc ...'
-func_infer_tag () {
+func_infer_tag ()
+{
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -235,12 +282,116 @@
esac
fi
}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+ f_ex_an_ar_dir="$1"; shift
+ f_ex_an_ar_oldlib="$1"
+
+ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
+ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
+ exit $EXIT_FAILURE
+ fi
+}
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+ my_gentop="$1"; shift
+ my_oldlibs=${1+"$@"}
+ my_oldobjs=""
+ my_xlib=""
+ my_xabs=""
+ my_xdir=""
+ my_status=""
+
+ $show "${rm}r $my_gentop"
+ $run ${rm}r "$my_gentop"
+ $show "$mkdir $my_gentop"
+ $run $mkdir "$my_gentop"
+ my_status=$?
+ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
+ exit $my_status
+ fi
+
+ for my_xlib in $my_oldlibs; do
+ # Extract the objects.
+ case $my_xlib in
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ *) my_xabs=`pwd`"/$my_xlib" ;;
+ esac
+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+ my_xdir="$my_gentop/$my_xlib"
+
+ $show "${rm}r $my_xdir"
+ $run ${rm}r "$my_xdir"
+ $show "$mkdir $my_xdir"
+ $run $mkdir "$my_xdir"
+ exit_status=$?
+ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
+ exit $exit_status
+ fi
+ case $host in
+ *-darwin*)
+ $show "Extracting $my_xabs"
+ # Do not bother doing anything if just a dry run
+ if test -z "$run"; then
+ darwin_orig_dir=`pwd`
+ cd $my_xdir || exit $?
+ darwin_archive=$my_xabs
+ darwin_curdir=`pwd`
+ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
+ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
+ if test -n "$darwin_arches"; then
+ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
+ darwin_arch=
+ $show "$darwin_base_archive has multiple architectures $darwin_arches"
+ for darwin_arch in $darwin_arches ; do
+ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ cd "$darwin_curdir"
+ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ done # $darwin_arches
+ ## Okay now we have a bunch of thin objects, gotta fatten them up :)
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
+ darwin_file=
+ darwin_files=
+ for darwin_file in $darwin_filelist; do
+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+ lipo -create -output "$darwin_file" $darwin_files
+ done # $darwin_filelist
+ ${rm}r unfat-$$
+ cd "$darwin_orig_dir"
+ else
+ cd "$darwin_orig_dir"
+ func_extract_an_archive "$my_xdir" "$my_xabs"
+ fi # $darwin_arches
+ fi # $run
+ ;;
+ *)
+ func_extract_an_archive "$my_xdir" "$my_xabs"
+ ;;
+ esac
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ done
+ func_extract_archives_result="$my_oldobjs"
+}
# End of Shell function definitions
#####################################
# Darwin sucks
eval std_shrext=\"$shrext_cmds\"
+disable_libs=no
+
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
@@ -305,10 +456,10 @@
--version)
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
$echo
- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
+ $echo "Copyright (C) 2005 Free Software Foundation, Inc."
$echo "This is free software; see the source for copying conditions. There is NO"
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $EXIT_SUCCESS
+ exit $?
;;
--config)
@@ -317,7 +468,7 @@
for tagname in $taglist; do
${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
done
- exit $EXIT_SUCCESS
+ exit $?
;;
--debug)
@@ -342,7 +493,7 @@
else
$echo "disable static libraries"
fi
- exit $EXIT_SUCCESS
+ exit $?
;;
--finish) mode="finish" ;;
@@ -357,7 +508,11 @@
preserve_args="$preserve_args $arg"
;;
- --tag) prevopt="--tag" prev=tag ;;
+ --tag)
+ prevopt="--tag"
+ prev=tag
+ preserve_args="$preserve_args --tag"
+ ;;
--tag=*)
set tag "$optarg" ${1+"$@"}
shift
@@ -389,6 +544,18 @@
exit $EXIT_FAILURE
fi
+case $disable_libs in
+no)
+ ;;
+shared)
+ build_libtool_libs=no
+ build_old_libs=yes
+ ;;
+static)
+ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+ ;;
+esac
+
# 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.
@@ -399,7 +566,7 @@
# Infer the operation mode.
if test -z "$mode"; then
$echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
case $nonopt in
*cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
mode=link
@@ -465,7 +632,7 @@
for arg
do
- case "$arg_mode" in
+ case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
@@ -547,7 +714,10 @@
case $lastarg in
# Double-quote args containing other shell metacharacters.
# Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
+ # in scan sets, and some SunOS ksh mistreat backslash-escaping
+ # in scan sets (worked around with variable expansion),
+ # and furthermore cannot handle '|' '&' '(' ')' in scan sets
+ # at all, so we specify them separately.
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
lastarg="\"$lastarg\""
;;
@@ -621,6 +791,14 @@
esac
done
+ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
+ case $qlibobj in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ qlibobj="\"$qlibobj\"" ;;
+ esac
+ test "X$libobj" != "X$qlibobj" \
+ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
+ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
@@ -693,12 +871,17 @@
$run $rm $removelist
exit $EXIT_FAILURE
fi
- $echo $srcfile > "$lockfile"
+ $echo "$srcfile" > "$lockfile"
fi
if test -n "$fix_srcfile_path"; then
eval srcfile=\"$fix_srcfile_path\"
fi
+ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
+ case $qsrcfile in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ qsrcfile="\"$qsrcfile\"" ;;
+ esac
$run $rm "$libobj" "${libobj}T"
@@ -720,18 +903,18 @@
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
- command="$base_compile $srcfile $pic_flag"
+ command="$base_compile $qsrcfile $pic_flag"
else
# Don't build PIC code
- command="$base_compile $srcfile"
+ command="$base_compile $qsrcfile"
fi
if test ! -d "${xdir}$objdir"; then
$show "$mkdir ${xdir}$objdir"
$run $mkdir ${xdir}$objdir
- status=$?
- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
- exit $status
+ exit_status=$?
+ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
+ exit $exit_status
fi
fi
@@ -803,9 +986,9 @@
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
- command="$base_compile $srcfile"
+ command="$base_compile $qsrcfile"
else
- command="$base_compile $srcfile $pic_flag"
+ command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
@@ -934,6 +1117,7 @@
no_install=no
objs=
non_pic_objects=
+ notinst_path= # paths that contain not-installed libtool libraries
precious_files_regex=
prefer_static_libs=no
preload=no
@@ -962,14 +1146,15 @@
if test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
+ prefer_static_libs=yes
else
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
+ prefer_static_libs=built
fi
build_libtool_libs=no
build_old_libs=yes
- prefer_static_libs=yes
break
;;
esac
@@ -1144,6 +1329,11 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+ non_pic_object="$pic_object"
+ non_pic_objects="$non_pic_objects $non_pic_object"
fi
else
# Only an error if not doing a dry-run.
@@ -1227,6 +1417,13 @@
prev=
continue
;;
+ darwin_framework|darwin_framework_skip)
+ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ prev=
+ continue
+ ;;
*)
eval "$prev=\"\$arg\""
prev=
@@ -1285,6 +1482,18 @@
continue
;;
+ -framework|-arch|-isysroot)
+ case " $CC " in
+ *" ${arg} ${1} "* | *" ${arg} ${1} "*)
+ prev=darwin_framework_skip ;;
+ *) compiler_flags="$compiler_flags $arg"
+ prev=darwin_framework ;;
+ esac
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ continue
+ ;;
+
-inst-prefix-dir)
prev=inst_prefix
continue
@@ -1311,7 +1520,8 @@
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
- exit $EXIT_FAILURE
+ absdir="$dir"
+ notinst_path="$notinst_path $dir"
fi
dir="$absdir"
;;
@@ -1325,10 +1535,15 @@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
*) dllsearchpath="$dllsearchpath:$dir";;
esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
+ esac
;;
esac
continue
@@ -1337,15 +1552,15 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-pw32* | *-*-beos*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
# These systems don't actually have a C or math library (as such)
continue
;;
- *-*-mingw* | *-*-os2*)
+ *-*-os2*)
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc due to us having libc/libc_r.
test "X$arg" = "X-lc" && continue
;;
@@ -1353,10 +1568,19 @@
# Rhapsody C and math libraries are in the System framework
deplibs="$deplibs -framework System"
continue
+ ;;
+ *-*-sco3.2v5* | *-*-sco5v6*)
+ # Causes problems with __ctype
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+ # Compiler inserts libc in the correct place for threads to work
+ test "X$arg" = "X-lc" && continue
+ ;;
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -1366,8 +1590,20 @@
continue
;;
+ # Tru64 UNIX uses -model [arg] to determine the layout of C++
+ # classes, name mangling, and exception handling.
+ -model)
+ compile_command="$compile_command $arg"
+ compiler_flags="$compiler_flags $arg"
+ finalize_command="$finalize_command $arg"
+ prev=xcompiler
+ continue
+ ;;
+
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
- deplibs="$deplibs $arg"
+ compiler_flags="$compiler_flags $arg"
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
continue
;;
@@ -1376,13 +1612,19 @@
continue
;;
- # gcc -m* arguments should be passed to the linker via $compiler_flags
- # in order to pass architecture information to the linker
- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
- # but this is not reliable with gcc because gcc may use -mfoo to
- # select a different linker, different libraries, etc, while
- # -Wl,-mfoo simply passes -mfoo to the linker.
- -m*)
+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+ # -r[0-9][0-9]* specifies the processor on the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+ # +DA*, +DD* enable 64-bit mode on the HP compiler
+ # -q* pass through compiler args for the IBM compiler
+ # -m* pass through architecture-specific compiler args for GCC
+ # -m*, -t[45]*, -txscale* pass through architecture-specific
+ # compiler args for GCC
+ # -pg pass through profiling flag for GCC
+ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+ -t[45]*|-txscale*|@*)
+
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
@@ -1393,9 +1635,7 @@
esac
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
- if test "$with_gcc" = "yes" ; then
- compiler_flags="$compiler_flags $arg"
- fi
+ compiler_flags="$compiler_flags $arg"
continue
;;
@@ -1633,6 +1873,11 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+ non_pic_object="$pic_object"
+ non_pic_objects="$non_pic_objects $non_pic_object"
fi
else
# Only an error if not doing a dry-run.
@@ -1738,9 +1983,9 @@
if test ! -d "$output_objdir"; then
$show "$mkdir $output_objdir"
$run $mkdir $output_objdir
- status=$?
- if test "$status" -ne 0 && test ! -d "$output_objdir"; then
- exit $status
+ exit_status=$?
+ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
+ exit $exit_status
fi
fi
@@ -1803,7 +2048,6 @@
newlib_search_path=
need_relink=no # whether we're linking any uninstalled libtool libraries
notinst_deplibs= # not-installed libtool libraries
- notinst_path= # paths that contain not-installed libtool libraries
case $linkmode in
lib)
passes="conv link"
@@ -1858,7 +2102,7 @@
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- deplibs="$deplib $deplibs"
+ compiler_flags="$compiler_flags $deplib"
fi
continue
;;
@@ -1977,7 +2221,22 @@
fi
case $linkmode in
lib)
- if test "$deplibs_check_method" != pass_all; then
+ valid_a_lib=no
+ case $deplibs_check_method in
+ match_pattern*)
+ set dummy $deplibs_check_method
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ if eval $echo \"$deplib\" 2>/dev/null \
+ | $SED 10q \
+ | $EGREP "$match_pattern_regex" > /dev/null; then
+ valid_a_lib=yes
+ fi
+ ;;
+ pass_all)
+ valid_a_lib=yes
+ ;;
+ esac
+ if test "$valid_a_lib" != yes; then
$echo
$echo "*** Warning: Trying to link with static lib archive $deplib."
$echo "*** I have the capability to make that library automatically link in when"
@@ -2027,7 +2286,7 @@
esac # case $deplib
if test "$found" = yes || test -f "$lib"; then :
else
- $echo "$modename: cannot find the library \`$lib'" 1>&2
+ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
exit $EXIT_FAILURE
fi
@@ -2051,6 +2310,8 @@
# it will not redefine variables installed, or shouldnotlink
installed=yes
shouldnotlink=no
+ avoidtemprpath=
+
# Read the .la file
case $lib in
@@ -2149,11 +2410,19 @@
dir="$libdir"
absdir="$libdir"
fi
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
- # Remove this search path later
- notinst_path="$notinst_path $abs_ladir"
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ dir="$ladir"
+ absdir="$abs_ladir"
+ # Remove this search path later
+ notinst_path="$notinst_path $abs_ladir"
+ else
+ dir="$ladir/$objdir"
+ absdir="$abs_ladir/$objdir"
+ # Remove this search path later
+ notinst_path="$notinst_path $abs_ladir"
+ fi
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -2226,12 +2495,12 @@
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
# We need to hardcode the library path
- if test -n "$shlibpath_var"; then
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
case "$temp_rpath " in
*" $dir "*) ;;
*" $absdir "*) ;;
- *) temp_rpath="$temp_rpath $dir" ;;
+ *) temp_rpath="$temp_rpath $absdir" ;;
esac
fi
@@ -2268,8 +2537,12 @@
fi
link_static=no # Whether the deplib will be linked statically
+ use_static_libs=$prefer_static_libs
+ if test "$use_static_libs" = built && test "$installed" = yes ; then
+ use_static_libs=no
+ fi
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { test "$use_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
need_relink=yes
@@ -2382,11 +2655,15 @@
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
- *-*-sco3.2v5* ) 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" ;;
*-*-darwin* )
# if the lib is a module then we can not link against
# it, someone is ignoring the new warnings I added
- if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+ if /usr/bin/file -L $add 2> /dev/null |
+ $EGREP ": [^:]* bundle" >/dev/null ; then
$echo "** Warning, lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
$echo
@@ -2417,7 +2694,7 @@
add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
- case "$libdir" in
+ case $libdir in
[\\/]*)
add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
@@ -2490,7 +2767,7 @@
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
+ case $libdir in
[\\/]*)
add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
@@ -2551,8 +2828,6 @@
fi
fi
else
- convenience="$convenience $dir/$old_library"
- old_convenience="$old_convenience $dir/$old_library"
deplibs="$dir/$old_library $deplibs"
link_static=yes
fi
@@ -2670,12 +2945,12 @@
*) continue ;;
esac
case " $deplibs " in
- *" $depdepl "*) ;;
- *) deplibs="$depdepl $deplibs" ;;
+ *" $path "*) ;;
+ *) deplibs="$path $deplibs" ;;
esac
case " $deplibs " in
- *" $path "*) ;;
- *) deplibs="$deplibs $path" ;;
+ *" $depdepl "*) ;;
+ *) deplibs="$depdepl $deplibs" ;;
esac
done
fi # link_all_deplibs != no
@@ -2947,7 +3222,7 @@
case $current in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
exit $EXIT_FAILURE
;;
@@ -2956,7 +3231,7 @@
case $revision in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
exit $EXIT_FAILURE
;;
@@ -2965,7 +3240,7 @@
case $age in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
exit $EXIT_FAILURE
;;
@@ -2991,7 +3266,7 @@
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
;;
freebsd-aout)
@@ -3144,9 +3419,9 @@
# Eliminate all temporary directories.
for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+ lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+ deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+ dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
done
if test -n "$xrpath"; then
@@ -3197,9 +3472,14 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-sco3.2v5* | *-*-sco5v6*)
+ # Causes problems with __ctype
+ ;;
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+ # Compiler inserts libc in the correct place for threads to work
;;
*)
# Add libc to deplibs on all other systems if necessary.
@@ -3243,11 +3523,11 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC -o conftest conftest.c $deplibs
+ $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
for i in $deplibs; do
- name="`expr $i : '-l\(.*\)'`"
+ name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" -ne "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3284,11 +3564,11 @@
# Error occurred in the first compile. Let's try to salvage
# the situation: Compile a separate program for each library.
for i in $deplibs; do
- name="`expr $i : '-l\(.*\)'`"
+ name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC -o conftest conftest.c $i
+ $LTCC $LTCFLAGS -o conftest conftest.c $i
# Did it work?
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
@@ -3336,7 +3616,7 @@
set dummy $deplibs_check_method
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
- name="`expr $a_deplib : '-l\(.*\)'`"
+ name=`expr $a_deplib : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3405,7 +3685,7 @@
set dummy $deplibs_check_method
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
- name="`expr $a_deplib : '-l\(.*\)'`"
+ name=`expr $a_deplib : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test -n "$name" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3535,6 +3815,35 @@
deplibs=$newdeplibs
fi
+
+ # move library search paths that coincide with paths to not yet
+ # installed libraries to the beginning of the library search list
+ new_libs=
+ for path in $notinst_path; do
+ case " $new_libs " in
+ *" -L$path/$objdir "*) ;;
+ *)
+ case " $deplibs " in
+ *" -L$path/$objdir "*)
+ new_libs="$new_libs -L$path/$objdir" ;;
+ esac
+ ;;
+ esac
+ done
+ for deplib in $deplibs; do
+ case $deplib in
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ done
+ deplibs="$new_libs"
+
+
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
@@ -3618,6 +3927,7 @@
fi
lib="$output_objdir/$realname"
+ linknames=
for link
do
linknames="$linknames $link"
@@ -3646,6 +3956,9 @@
# The command line is too long to execute in one step.
$show "using reloadable object file for export list..."
skipped_export=:
+ # Break out early, otherwise skipped_export may be
+ # set to false by a later but shorter cmd.
+ break
fi
done
IFS="$save_ifs"
@@ -3679,67 +3992,13 @@
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
- $show "${rm}r $gentop"
- $run ${rm}r "$gentop"
- $show "$mkdir $gentop"
- $run $mkdir "$gentop"
- status=$?
- if test "$status" -ne 0 && test ! -d "$gentop"; then
- exit $status
- fi
generated="$generated $gentop"
- for xlib in $convenience; do
- # Extract the objects.
- case $xlib in
- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
- *) xabs=`pwd`"/$xlib" ;;
- esac
- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
- xdir="$gentop/$xlib"
-
- $show "${rm}r $xdir"
- $run ${rm}r "$xdir"
- $show "$mkdir $xdir"
- $run $mkdir "$xdir"
- status=$?
- if test "$status" -ne 0 && test ! -d "$xdir"; then
- exit $status
- fi
- # We will extract separately just the conflicting names and we will no
- # longer touch any unique names. It is faster to leave these extract
- # automatically by $AR in one run.
- $show "(cd $xdir && $AR x $xabs)"
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
- $AR t "$xabs" | sort | uniq -cd | while read -r count name
- do
- i=1
- while test "$i" -le "$count"
- do
- # Put our $i before any first dot (extension)
- # Never overwrite any file
- name_to="$name"
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
- do
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
- done
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
- i=`expr $i + 1`
- done
- done
- fi
-
- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
- done
+ func_extract_archives $gentop $convenience
+ libobjs="$libobjs $func_extract_archives_result"
fi
fi
-
+
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
linker_flags="$linker_flags $flag"
@@ -3769,7 +4028,8 @@
fi
fi
- if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+ if test "X$skipped_export" != "X:" &&
+ len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
@@ -3788,6 +4048,7 @@
save_libobjs=$libobjs
fi
save_output=$output
+ output_la=`$echo "X$output" | $Xsed -e "$basename"`
# Clear the reloadable object creation command queue and
# initialize k to one.
@@ -3797,13 +4058,13 @@
delfiles=
last_robj=
k=1
- output=$output_objdir/$save_output-${k}.$objext
+ output=$output_objdir/$output_la-${k}.$objext
# Loop over the list of objects to be linked.
for obj in $save_libobjs
do
eval test_cmds=\"$reload_cmds $objlist $last_robj\"
if test "X$objlist" = X ||
- { len=`expr "X$test_cmds" : ".*"` &&
+ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
test "$len" -le "$max_cmd_len"; }; then
objlist="$objlist $obj"
else
@@ -3817,9 +4078,9 @@
# the last one created.
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
fi
- last_robj=$output_objdir/$save_output-${k}.$objext
+ last_robj=$output_objdir/$output_la-${k}.$objext
k=`expr $k + 1`
- output=$output_objdir/$save_output-${k}.$objext
+ output=$output_objdir/$output_la-${k}.$objext
objlist=$obj
len=1
fi
@@ -3839,13 +4100,13 @@
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
fi
- # Set up a command to remove the reloadale object files
+ # Set up a command to remove the reloadable object files
# after they are used.
i=0
while test "$i" -lt "$k"
do
i=`expr $i + 1`
- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
done
$echo "creating a temporary reloadable object file: $output"
@@ -3893,13 +4154,30 @@
IFS="$save_ifs"
eval cmd=\"$cmd\"
$show "$cmd"
- $run eval "$cmd" || exit $?
+ $run eval "$cmd" || {
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+ fi
+
+ exit $lt_exit
+ }
done
IFS="$save_ifs"
# Restore the uninstalled library and exit
if test "$mode" = relink; then
$run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+
+ if test -n "$convenience"; then
+ if test -z "$whole_archive_flag_spec"; then
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ fi
+ fi
+
exit $EXIT_SUCCESS
fi
@@ -3977,64 +4255,10 @@
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${obj}x"
- $show "${rm}r $gentop"
- $run ${rm}r "$gentop"
- $show "$mkdir $gentop"
- $run $mkdir "$gentop"
- status=$?
- if test "$status" -ne 0 && test ! -d "$gentop"; then
- exit $status
- fi
generated="$generated $gentop"
- for xlib in $convenience; do
- # Extract the objects.
- case $xlib in
- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
- *) xabs=`pwd`"/$xlib" ;;
- esac
- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
- xdir="$gentop/$xlib"
-
- $show "${rm}r $xdir"
- $run ${rm}r "$xdir"
- $show "$mkdir $xdir"
- $run $mkdir "$xdir"
- status=$?
- if test "$status" -ne 0 && test ! -d "$xdir"; then
- exit $status
- fi
- # We will extract separately just the conflicting names and we will no
- # longer touch any unique names. It is faster to leave these extract
- # automatically by $AR in one run.
- $show "(cd $xdir && $AR x $xabs)"
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
- $AR t "$xabs" | sort | uniq -cd | while read -r count name
- do
- i=1
- while test "$i" -le "$count"
- do
- # Put our $i before any first dot (extension)
- # Never overwrite any file
- name_to="$name"
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
- do
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
- done
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
- i=`expr $i + 1`
- done
- done
- fi
-
- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
- done
+ func_extract_archives $gentop $convenience
+ reload_conv_objs="$reload_objs $func_extract_archives_result"
fi
fi
@@ -4135,6 +4359,35 @@
;;
esac
+
+ # move library search paths that coincide with paths to not yet
+ # installed libraries to the beginning of the library search list
+ new_libs=
+ for path in $notinst_path; do
+ case " $new_libs " in
+ *" -L$path/$objdir "*) ;;
+ *)
+ case " $compile_deplibs " in
+ *" -L$path/$objdir "*)
+ new_libs="$new_libs -L$path/$objdir" ;;
+ esac
+ ;;
+ esac
+ done
+ for deplib in $compile_deplibs; do
+ case $deplib in
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ done
+ compile_deplibs="$new_libs"
+
+
compile_command="$compile_command $compile_deplibs"
finalize_command="$finalize_command $finalize_deplibs"
@@ -4179,10 +4432,15 @@
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
*) dllsearchpath="$dllsearchpath:$libdir";;
esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
+ esac
;;
esac
done
@@ -4296,13 +4554,25 @@
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- export_symbols="$output_objdir/$output.exp"
+ export_symbols="$output_objdir/$outputname.exp"
$run $rm $export_symbols
- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ case $host in
+ *cygwin* | *mingw* )
+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+ ;;
+ esac
else
- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
$run eval 'mv "$nlist"T "$nlist"'
+ case $host in
+ *cygwin* | *mingw* )
+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+ ;;
+ esac
fi
fi
@@ -4353,7 +4623,26 @@
#endif
/* The mapping between symbol names and symbols. */
+"
+
+ case $host in
+ *cygwin* | *mingw* )
+ $echo >> "$output_objdir/$dlsyms" "\
+/* DATA imports from DLLs on WIN32 can't be const, because
+ runtime relocations are performed -- see ld's documentation
+ on pseudo-relocs */
+struct {
+"
+ ;;
+ * )
+ $echo >> "$output_objdir/$dlsyms" "\
const struct {
+"
+ ;;
+ esac
+
+
+ $echo >> "$output_objdir/$dlsyms" "\
const char *name;
lt_ptr address;
}
@@ -4400,16 +4689,29 @@
esac
# Now compile the dynamic symbol file.
- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
# Clean up the generated files.
$show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
$run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
# Transform the symbol file into the correct name.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ case $host in
+ *cygwin* | *mingw* )
+ if test -f "$output_objdir/${outputname}.def" ; then
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ else
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ fi
+ ;;
+ * )
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ ;;
+ esac
;;
*)
$echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
@@ -4434,7 +4736,7 @@
# We have no uninstalled library dependencies, so finalize right now.
$show "$link_command"
$run eval "$link_command"
- status=$?
+ exit_status=$?
# Delete the generated files.
if test -n "$dlsyms"; then
@@ -4442,7 +4744,7 @@
$run $rm "$output_objdir/${outputname}S.${objext}"
fi
- exit $status
+ exit $exit_status
fi
if test -n "$shlibpath_var"; then
@@ -4582,10 +4884,12 @@
esac
case $host in
*cygwin* | *mingw* )
- cwrappersource=`$echo ${objdir}/lt-${output}.c`
- cwrapper=`$echo ${output}.exe`
- $rm $cwrappersource $cwrapper
- trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+ output_name=`basename $output`
+ output_path=`dirname $output`
+ cwrappersource="$output_path/$objdir/lt-$output_name.c"
+ cwrapper="$output_path/$output_name.exe"
+ $rm $cwrappersource $cwrapper
+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
cat > $cwrappersource <<EOF
@@ -4610,6 +4914,9 @@
#include <malloc.h>
#include <stdarg.h>
#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
@@ -4620,15 +4927,19 @@
#endif
#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
#endif
#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2
-#define DIR_SEPARATOR_2 '\\'
-#endif
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# ifndef DIR_SEPARATOR_2
+# define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+# define PATH_SEPARATOR_2 ';'
+# endif
#endif
#ifndef DIR_SEPARATOR_2
@@ -4638,17 +4949,32 @@
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
#endif /* DIR_SEPARATOR_2 */
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
#define XFREE(stale) do { \
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
+/* -DDEBUG is fairly common in CFLAGS. */
+#undef DEBUG
+#if defined DEBUGWRAPPER
+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
+#else
+# define DEBUG(format, ...)
+#endif
+
const char *program_name = NULL;
void * xmalloc (size_t num);
char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
+const char * base_name (const char *name);
+char * find_executable(const char *wrapper);
+int check_executable(const char *path);
char * strendzap(char *str, const char *pat);
void lt_fatal (const char *message, ...);
@@ -4658,29 +4984,51 @@
char **newargz;
int i;
- program_name = (char *) xstrdup ((char *) basename (argv[0]));
+ program_name = (char *) xstrdup (base_name (argv[0]));
+ DEBUG("(main) argv[0] : %s\n",argv[0]);
+ DEBUG("(main) program_name : %s\n",program_name);
newargz = XMALLOC(char *, argc+2);
EOF
- cat >> $cwrappersource <<EOF
- newargz[0] = "$SHELL";
+ cat >> $cwrappersource <<EOF
+ newargz[0] = (char *) xstrdup("$SHELL");
EOF
- cat >> $cwrappersource <<"EOF"
- newargz[1] = fnqualify(argv[0]);
+ cat >> $cwrappersource <<"EOF"
+ newargz[1] = find_executable(argv[0]);
+ if (newargz[1] == NULL)
+ lt_fatal("Couldn't find %s", argv[0]);
+ DEBUG("(main) found exe at : %s\n",newargz[1]);
/* we know the script has the same name, without the .exe */
/* so make sure newargz[1] doesn't end in .exe */
strendzap(newargz[1],".exe");
for (i = 1; i < argc; i++)
newargz[i+1] = xstrdup(argv[i]);
newargz[argc+1] = NULL;
+
+ for (i=0; i<argc+1; i++)
+ {
+ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
+ ;
+ }
+
EOF
- cat >> $cwrappersource <<EOF
+ case $host_os in
+ mingw*)
+ cat >> $cwrappersource <<EOF
+ execv("$SHELL",(char const **)newargz);
+EOF
+ ;;
+ *)
+ cat >> $cwrappersource <<EOF
execv("$SHELL",newargz);
EOF
+ ;;
+ esac
- cat >> $cwrappersource <<"EOF"
+ cat >> $cwrappersource <<"EOF"
+ return 127;
}
void *
@@ -4700,48 +5048,148 @@
;
}
-char *
-basename (const char *name)
+const char *
+base_name (const char *name)
{
const char *base;
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
/* Skip over the disk name in MSDOS pathnames. */
- if (isalpha (name[0]) && name[1] == ':')
+ if (isalpha ((unsigned char)name[0]) && name[1] == ':')
name += 2;
#endif
for (base = name; *name; name++)
if (IS_DIR_SEPARATOR (*name))
base = name + 1;
- return (char *) base;
+ return base;
}
+int
+check_executable(const char * path)
+{
+ struct stat st;
+
+ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
+ if ((!path) || (!*path))
+ return 0;
+
+ if ((stat (path, &st) >= 0) &&
+ (
+ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
+#if defined (S_IXOTH)
+ ((st.st_mode & S_IXOTH) == S_IXOTH) ||
+#endif
+#if defined (S_IXGRP)
+ ((st.st_mode & S_IXGRP) == S_IXGRP) ||
+#endif
+ ((st.st_mode & S_IXUSR) == S_IXUSR))
+ )
+ return 1;
+ else
+ return 0;
+}
+
+/* Searches for the full path of the wrapper. Returns
+ newly allocated full path name if found, NULL otherwise */
char *
-fnqualify(const char *path)
+find_executable (const char* wrapper)
{
- size_t size;
- char *p;
+ int has_slash = 0;
+ const char* p;
+ const char* p_next;
+ /* static buffer for getcwd */
char tmp[LT_PATHMAX + 1];
+ int tmp_len;
+ char* concat_name;
- assert(path != NULL);
+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
- /* Is it qualified already? */
+ if ((wrapper == NULL) || (*wrapper == '\0'))
+ return NULL;
+
+ /* Absolute path? */
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- if (isalpha (path[0]) && path[1] == ':')
- return xstrdup (path);
+ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
+ {
+ concat_name = xstrdup (wrapper);
+ if (check_executable(concat_name))
+ return concat_name;
+ XFREE(concat_name);
+ }
+ else
+ {
+#endif
+ if (IS_DIR_SEPARATOR (wrapper[0]))
+ {
+ concat_name = xstrdup (wrapper);
+ if (check_executable(concat_name))
+ return concat_name;
+ XFREE(concat_name);
+ }
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ }
#endif
- if (IS_DIR_SEPARATOR (path[0]))
- return xstrdup (path);
- /* prepend the current directory */
- /* doesn't handle '~' */
+ for (p = wrapper; *p; p++)
+ if (*p == '/')
+ {
+ has_slash = 1;
+ break;
+ }
+ if (!has_slash)
+ {
+ /* no slashes; search PATH */
+ const char* path = getenv ("PATH");
+ if (path != NULL)
+ {
+ for (p = path; *p; p = p_next)
+ {
+ const char* q;
+ size_t p_len;
+ for (q = p; *q; q++)
+ if (IS_PATH_SEPARATOR(*q))
+ break;
+ p_len = q - p;
+ p_next = (*q == '\0' ? q : q + 1);
+ if (p_len == 0)
+ {
+ /* empty path: current directory */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+ tmp_len = strlen(tmp);
+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+ memcpy (concat_name, tmp, tmp_len);
+ concat_name[tmp_len] = '/';
+ strcpy (concat_name + tmp_len + 1, wrapper);
+ }
+ else
+ {
+ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
+ memcpy (concat_name, p, p_len);
+ concat_name[p_len] = '/';
+ strcpy (concat_name + p_len + 1, wrapper);
+ }
+ if (check_executable(concat_name))
+ return concat_name;
+ XFREE(concat_name);
+ }
+ }
+ /* not found in PATH; assume curdir */
+ }
+ /* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
lt_fatal ("getcwd failed");
- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
- p = XMALLOC(char, size);
- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
- return p;
+ tmp_len = strlen(tmp);
+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+ memcpy (concat_name, tmp, tmp_len);
+ concat_name[tmp_len] = '/';
+ strcpy (concat_name + tmp_len + 1, wrapper);
+
+ if (check_executable(concat_name))
+ return concat_name;
+ XFREE(concat_name);
+ return NULL;
}
char *
@@ -4785,16 +5233,16 @@
va_end (ap);
}
EOF
- # we should really use a build-platform specific compiler
- # here, but OTOH, the wrappers (shell script and this C one)
- # are only useful if you want to execute the "real" binary.
- # Since the "real" binary is built for $host, then this
- # wrapper might as well be built for $host, too.
- $run $LTCC -s -o $cwrapper $cwrappersource
- ;;
- esac
- $rm $output
- trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+ # we should really use a build-platform specific compiler
+ # here, but OTOH, the wrappers (shell script and this C one)
+ # are only useful if you want to execute the "real" binary.
+ # Since the "real" binary is built for $host, then this
+ # wrapper might as well be built for $host, too.
+ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
+ ;;
+ esac
+ $rm $output
+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
$echo > $output "\
#! $SHELL
@@ -4815,7 +5263,7 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
relink_command=\"$relink_command\"
@@ -4944,13 +5392,13 @@
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\
- exec \$progdir\\\\\$program \${1+\"\$@\"}
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
"
;;
*)
$echo >> $output "\
- exec \$progdir/\$program \${1+\"\$@\"}
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
"
;;
esac
@@ -4960,7 +5408,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 $EXIT_FAILURE
@@ -4992,71 +5440,73 @@
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
- $show "${rm}r $gentop"
- $run ${rm}r "$gentop"
- $show "$mkdir $gentop"
- $run $mkdir "$gentop"
- status=$?
- if test "$status" -ne 0 && test ! -d "$gentop"; then
- exit $status
- fi
generated="$generated $gentop"
- # Add in members from convenience archives.
- for xlib in $addlibs; do
- # Extract the objects.
- case $xlib in
- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
- *) xabs=`pwd`"/$xlib" ;;
- esac
- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
- xdir="$gentop/$xlib"
-
- $show "${rm}r $xdir"
- $run ${rm}r "$xdir"
- $show "$mkdir $xdir"
- $run $mkdir "$xdir"
- status=$?
- if test "$status" -ne 0 && test ! -d "$xdir"; then
- exit $status
- fi
- # We will extract separately just the conflicting names and we will no
- # longer touch any unique names. It is faster to leave these extract
- # automatically by $AR in one run.
- $show "(cd $xdir && $AR x $xabs)"
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
- $AR t "$xabs" | sort | uniq -cd | while read -r count name
- do
- i=1
- while test "$i" -le "$count"
- do
- # Put our $i before any first dot (extension)
- # Never overwrite any file
- name_to="$name"
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
- do
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
- done
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
- i=`expr $i + 1`
- done
- done
- fi
-
- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
- done
+ func_extract_archives $gentop $addlibs
+ oldobjs="$oldobjs $func_extract_archives_result"
fi
# Do each command in the archive commands.
if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
cmds=$old_archive_from_new_cmds
else
+ # POSIX demands no paths to be encoded in archives. We have
+ # to avoid creating archives with duplicate basenames if we
+ # might have to extract them afterwards, e.g., when creating a
+ # static archive out of a convenience library, or when linking
+ # the entirety of a libtool archive into another (currently
+ # not supported by libtool).
+ if (for obj in $oldobjs
+ do
+ $echo "X$obj" | $Xsed -e 's%^.*/%%'
+ done | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "copying selected object files to avoid basename conflicts..."
+
+ if test -z "$gentop"; then
+ gentop="$output_objdir/${outputname}x"
+ generated="$generated $gentop"
+
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ $show "$mkdir $gentop"
+ $run $mkdir "$gentop"
+ exit_status=$?
+ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
+ exit $exit_status
+ fi
+ fi
+
+ save_oldobjs=$oldobjs
+ oldobjs=
+ counter=1
+ for obj in $save_oldobjs
+ do
+ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+ case " $oldobjs " in
+ " ") oldobjs=$obj ;;
+ *[\ /]"$objbase "*)
+ while :; do
+ # Make sure we don't pick an alternate name that also
+ # overlaps.
+ newobj=lt$counter-$objbase
+ counter=`expr $counter + 1`
+ case " $oldobjs " in
+ *[\ /]"$newobj "*) ;;
+ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
+ esac
+ done
+ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+ $run ln "$obj" "$gentop/$newobj" ||
+ $run cp "$obj" "$gentop/$newobj"
+ oldobjs="$oldobjs $gentop/$newobj"
+ ;;
+ *) oldobjs="$oldobjs $obj" ;;
+ esac
+ done
+ fi
+
eval cmds=\"$old_archive_cmds\"
if len=`expr "X$cmds" : ".*"` &&
@@ -5070,20 +5520,7 @@
objlist=
concat_cmds=
save_oldobjs=$oldobjs
- # GNU ar 2.10+ was changed to match POSIX; thus no paths are
- # encoded into archives. This makes 'ar r' malfunction in
- # this piecewise linking case whenever conflicting object
- # names appear in distinct ar calls; check, warn and compensate.
- if (for obj in $save_oldobjs
- do
- $echo "X$obj" | $Xsed -e 's%^.*/%%'
- done | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
- AR_FLAGS=cq
- fi
+
# Is there a better way of finding the last object in the list?
for obj in $save_oldobjs
do
@@ -5094,7 +5531,7 @@
oldobjs="$objlist $obj"
objlist="$objlist $obj"
eval test_cmds=\"$old_archive_cmds\"
- if len=`expr "X$test_cmds" : ".*"` &&
+ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
test "$len" -le "$max_cmd_len"; then
:
else
@@ -5291,11 +5728,11 @@
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+ $echo "X$nonopt" | grep shtool > /dev/null; then
# Aesthetically quote it.
arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
@@ -5304,14 +5741,14 @@
shift
else
install_prog=
- arg="$nonopt"
+ arg=$nonopt
fi
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
@@ -5329,28 +5766,31 @@
do
if test -n "$dest"; then
files="$files $dest"
- dest="$arg"
+ dest=$arg
continue
fi
case $arg in
-d) isdir=yes ;;
- -f) prev="-f" ;;
- -g) prev="-g" ;;
- -m) prev="-m" ;;
- -o) prev="-o" ;;
+ -f)
+ case " $install_prog " in
+ *[\\\ /]cp\ *) ;;
+ *) prev=$arg ;;
+ esac
+ ;;
+ -g | -m | -o) prev=$arg ;;
-s)
stripme=" -s"
continue
;;
- -*) ;;
-
+ -*)
+ ;;
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
prev=
else
- dest="$arg"
+ dest=$arg
continue
fi
;;
@@ -5359,7 +5799,7 @@
# Aesthetically quote the argument.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
@@ -5528,11 +5968,14 @@
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
+ # Try `ln -sf' first, because the `ln' binary might depend on
+ # the symlink we replace! Solaris /bin/ln does not understand -f,
+ # so we also need to try rm && ln -s.
for linkname
do
if test "$linkname" != "$realname"; then
- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
fi
done
fi
@@ -5545,7 +5988,16 @@
IFS="$save_ifs"
eval cmd=\"$cmd\"
$show "$cmd"
- $run eval "$cmd" || exit $?
+ $run eval "$cmd" || {
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+ fi
+
+ exit $lt_exit
+ }
done
IFS="$save_ifs"
fi
@@ -5639,17 +6091,15 @@
notinst_deplibs=
relink_command=
- # To insure that "foo" is sourced, and not "foo.exe",
- # finese the cygwin/MSYS system by explicitly sourcing "foo."
- # which disallows the automatic-append-.exe behavior.
- case $build in
- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
- *) wrapperdot=${wrapper} ;;
- esac
+ # Note that it is not necessary on cygwin/mingw to append a dot to
+ # foo even if both foo and FILE.exe exist: automatic-append-.exe
+ # behavior happens only for exec(3), not for open(2)! Also, sourcing
+ # `FILE.' does not work on cygwin managed mounts.
+ #
# If there is no directory component, then add one.
- case $file in
- */* | *\\*) . ${wrapperdot} ;;
- *) . ./${wrapperdot} ;;
+ case $wrapper in
+ */* | *\\*) . ${wrapper} ;;
+ *) . ./${wrapper} ;;
esac
# Check the variables that should have been set.
@@ -5677,34 +6127,21 @@
done
relink_command=
- # To insure that "foo" is sourced, and not "foo.exe",
- # finese the cygwin/MSYS system by explicitly sourcing "foo."
- # which disallows the automatic-append-.exe behavior.
- case $build in
- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
- *) wrapperdot=${wrapper} ;;
- esac
+ # Note that it is not necessary on cygwin/mingw to append a dot to
+ # foo even if both foo and FILE.exe exist: automatic-append-.exe
+ # behavior happens only for exec(3), not for open(2)! Also, sourcing
+ # `FILE.' does not work on cygwin managed mounts.
+ #
# If there is no directory component, then add one.
- case $file in
- */* | *\\*) . ${wrapperdot} ;;
- *) . ./${wrapperdot} ;;
+ case $wrapper in
+ */* | *\\*) . ${wrapper} ;;
+ *) . ./${wrapper} ;;
esac
outputname=
if test "$fast_install" = no && test -n "$relink_command"; then
if test "$finalize" = yes && test -z "$run"; then
- tmpdir="/tmp"
- test -n "$TMPDIR" && tmpdir="$TMPDIR"
- tmpdir="$tmpdir/libtool-$$"
- save_umask=`umask`
- umask 0077
- if $mkdir "$tmpdir"; then
- umask $save_umask
- else
- umask $save_umask
- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
- continue
- fi
+ tmpdir=`func_mktempdir`
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -5728,7 +6165,7 @@
fi
# remove .exe since cygwin /usr/bin/install will append another
- # one anyways
+ # one anyway
case $install_prog,$host in
*/usr/bin/install*,*cygwin*)
case $file:$destfile in
@@ -5828,7 +6265,7 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
- $echo "----------------------------------------------------------------------"
+ $echo "X----------------------------------------------------------------------" | $Xsed
$echo "Libraries have been installed in:"
for libdir in $libdirs; do
$echo " $libdir"
@@ -5861,7 +6298,7 @@
$echo
$echo "See any operating system documentation about shared libraries for"
$echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
+ $echo "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
;;
@@ -6078,9 +6515,17 @@
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
- if test "$mode" = uninstall; then
+ case "$mode" in
+ clean)
+ case " $library_names " in
+ # " " in the beginning catches empty $dlname
+ *" $dlname "*) ;;
+ *) rmfiles="$rmfiles $objdir/$dlname" ;;
+ esac
+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ ;;
+ uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
cmds=$postuninstall_cmds
@@ -6113,7 +6558,8 @@
IFS="$save_ifs"
fi
# FIXME: should reinstall the best remaining shared library.
- fi
+ ;;
+ esac
fi
;;
@@ -6398,7 +6844,7 @@
$echo
$echo "Try \`$modename --help' for more information about other modes."
-exit $EXIT_SUCCESS
+exit $?
# The TAGs below are defined such that we never get into a situation
# in which we disable both kinds of libraries. Given conflicting
@@ -6412,12 +6858,11 @@
# configuration. But we'll never go from static-only to shared-only.
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
+disable_libs=shared
# ### END LIBTOOL TAG CONFIG: disable-shared
# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+disable_libs=static
# ### END LIBTOOL TAG CONFIG: disable-static
# Local Variables:
diff -uhrN WindowMaker-0.92.0/po/de.po WindowMaker-CVS-20060123/po/de.po
--- WindowMaker-0.92.0/po/de.po 2004-10-26 05:52:38.000000000 +0200
+++ WindowMaker-CVS-20060123/po/de.po 2005-07-05 21:39:14.000000000 +0200
@@ -1,38 +1,44 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+# German Message Catalog for Window Maker
+#
+# Initial translation
+# Gudio Scholz <guido.scholz@bayernline.de>
+# Bernd Eggert <Bernd.Eggert@t-online.de>
+#
+# Adapted to versions 0.80 ff.
+# Torsten Marek <shlomme@gmx.net>
+#
+
msgid ""
msgstr ""
-"Project-Id-Version: WindowMaker 0.80.0\n"
-"POT-Creation-Date: 2002-01-22 21:20+0100\n"
-"PO-Revision-Date: 2002-01-25 16:42GMT\n"
-"Last-Translator: Torsten Marek <shlomme@gmx.net>\n"
-"Language-Team: German \n"
+"Project-Id-Version: Window Maker 0.91\n"
+"POT-Creation-Date: 2004-11-01 16:17+0100\n"
+"PO-Revision-Date: 2004-11-08 22:58+0100\n"
+"Last-Translator: shlomme@gmx.net\n"
+"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.6\n"
-#: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325
-#: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1850
-#: ../src/winspector.c:389 ../src/winspector.c:406
+#: ../src/appicon.c:415 ../src/dialog.c:295 ../src/dock.c:3335
+#: ../src/dockedapp.c:231 ../src/main.c:271 ../src/rootmenu.c:1854
+#: ../src/winspector.c:394 ../src/winspector.c:411
msgid "Error"
msgstr "Fehler"
-#: ../src/appicon.c:427
+#: ../src/appicon.c:416
msgid "Could not open specified icon file"
msgstr "Symboldatei konnte nicht geöffnet werden"
-#: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282
-#: ../src/dialog.c:729 ../src/dialog.c:1814 ../src/dock.c:526
-#: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326
-#: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273
-#: ../src/rootmenu.c:1854 ../src/winspector.c:390 ../src/winspector.c:407
+#: ../src/appicon.c:417 ../src/dialog.c:192 ../src/dialog.c:295
+#: ../src/dialog.c:725 ../src/dialog.c:1796 ../src/dock.c:515
+#: ../src/dock.c:523 ../src/dock.c:547 ../src/dock.c:3336
+#: ../src/dockedapp.c:232 ../src/dockedapp.c:427 ../src/main.c:271
+#: ../src/rootmenu.c:1858 ../src/winspector.c:395 ../src/winspector.c:412
msgid "OK"
msgstr "OK"
-#: ../src/appicon.c:456 ../src/dock.c:264
+#: ../src/appicon.c:445 ../src/dock.c:244
msgid ""
" will be forcibly closed.\n"
"Any unsaved changes will be lost.\n"
@@ -42,344 +48,369 @@
"Alle ungespeicherten Änderungen gehen dabei verloren.\n"
"Bitte bestätigen."
-#: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:124
+#: ../src/appicon.c:453 ../src/dock.c:263 ../src/winmenu.c:124
msgid "Kill Application"
msgstr "Anwendung töten"
-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
msgid "Yes"
msgstr "Ja"
-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
msgid "No"
msgstr "Nein"
-#: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491
+#: ../src/appicon.c:484 ../src/dock.c:1168 ../src/dock.c:3501
msgid "Unhide Here"
msgstr "Hier wiederherstellen"
-#: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179
-#: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:461
+#: ../src/appicon.c:485 ../src/appicon.c:510 ../src/dock.c:1170
+#: ../src/dock.c:1172 ../src/dock.c:3513 ../src/winmenu.c:461
msgid "Hide"
msgstr "Verstecken"
-#: ../src/appicon.c:497
+#: ../src/appicon.c:486
msgid "Set Icon..."
msgstr "Symbol wählen..."
-#: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248
+#: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248
#: ../src/rootmenu.c:264 ../src/winmenu.c:508
msgid "Kill"
msgstr "Töten"
-#: ../src/appicon.c:519 ../src/dock.c:3501
+#: ../src/appicon.c:508 ../src/dock.c:3511
msgid "Unhide"
msgstr "Wiederherstellen"
-#: ../src/application.c:398
+#: ../src/application.c:405
#, c-format
msgid "recreating missing icon '%s'"
msgstr "fehlendes Symbol '%s' wird wiederhergestellt"
-#: ../src/defaults.c:919 ../src/defaults.c:1008
+#: ../src/defaults.c:930 ../src/defaults.c:1092
#, c-format
msgid "Domain %s (%s) of global defaults database is corrupted!"
msgstr "Domäne %s (%s) in globaler Standarddatenbank ist fehlerhaft!"
-#: ../src/defaults.c:924
+#: ../src/defaults.c:935
#, c-format
msgid "could not load domain %s from global defaults database"
msgstr "Domäne %s aus globaler Standarddatenbank konnte nicht geladen werden"
-#: ../src/defaults.c:946 ../src/startup.c:884 ../src/startup.c:902
-#: ../src/startup.c:908
+#: ../src/defaults.c:987 ../src/defaults.c:1002
+#, c-format
+msgid "invalid global menu file %s"
+msgstr "Ungültige Datei %s für globales Menü"
+
+#: ../src/defaults.c:1030 ../src/startup.c:762 ../src/startup.c:780
+#: ../src/startup.c:787
#, c-format
msgid "could not read domain \"%s\" from defaults database"
-msgstr "Dömane \"%s\" aus Standarddatenbank konnte nicht gelesen werden"
+msgstr "Dömane \"%s\" aus der Standarddatenbank konnte nicht gelesen werden"
-#: ../src/defaults.c:992 ../src/defaults.c:1096 ../src/defaults.c:1137
-#: ../src/defaults.c:1193
+#: ../src/defaults.c:1076 ../src/defaults.c:1181 ../src/defaults.c:1222
+#: ../src/defaults.c:1278
#, c-format
msgid "Domain %s (%s) of defaults database is corrupted!"
-msgstr "Domäne %s (%s) aus Standarddatenbank ist fehlerhaft!"
+msgstr "Domäne %s (%s) aus der Standarddatenbank ist fehlerhaft!"
-#: ../src/defaults.c:997 ../src/defaults.c:1116 ../src/defaults.c:1173
-#: ../src/defaults.c:1202
+#: ../src/defaults.c:1081 ../src/defaults.c:1201 ../src/defaults.c:1258
+#: ../src/defaults.c:1288
#, c-format
msgid "could not load domain %s from user defaults database"
msgstr "Domäne %s aus Benutzer-Standarddatenbank konnte nicht geladen werden"
-#: ../src/defaults.c:1027
+#: ../src/defaults.c:1111
#, c-format
msgid "could not load domain %s from global defaults database (%s)"
msgstr "Dömane %s konnte nicht aus globaler Standarddatenbank (%s) gelesen werden"
-#: ../src/defaults.c:1163 ../src/screen.c:458
+#: ../src/defaults.c:1248 ../src/screen.c:419
#, c-format
msgid "could not load logo image for panels: %s"
msgstr "Panel-Logo konnte nicht geladen werden: %s"
#. --------------------------- Local -----------------------
-#: ../src/defaults.c:1411 ../src/defaults.c:1553 ../src/defaults.c:1665
-#: ../src/defaults.c:2144 ../src/defaults.c:2161 ../src/defaults.c:2206
-#: ../src/defaults.c:2253 ../src/defaults.c:2726 ../src/wdefaults.c:571
-#: ../src/wdefaults.c:607
+#: ../src/defaults.c:1497 ../src/defaults.c:1636 ../src/defaults.c:1756
+#: ../src/defaults.c:2234 ../src/defaults.c:2251 ../src/defaults.c:2296
+#: ../src/defaults.c:2343 ../src/defaults.c:2816 ../src/wdefaults.c:571
+#: ../src/wdefaults.c:604
#, c-format
msgid "Wrong option format for key \"%s\". Should be %s."
msgstr "Falsches Optionsformat für Schlüssel \"%s\". %s erwartet."
-#: ../src/defaults.c:1413 ../src/defaults.c:1494 ../src/defaults.c:1526
-#: ../src/defaults.c:1558 ../src/defaults.c:1571 ../src/defaults.c:1586
-#: ../src/defaults.c:1600 ../src/defaults.c:1670 ../src/defaults.c:1682
-#: ../src/defaults.c:2149 ../src/defaults.c:2166 ../src/defaults.c:2179
-#: ../src/defaults.c:2211 ../src/defaults.c:2227 ../src/defaults.c:2258
-#: ../src/defaults.c:2345 ../src/defaults.c:2731 ../src/defaults.c:2742
+#: ../src/defaults.c:1499 ../src/defaults.c:1580 ../src/defaults.c:1610
+#: ../src/defaults.c:1641 ../src/defaults.c:1654 ../src/defaults.c:1669
+#: ../src/defaults.c:1683 ../src/defaults.c:1761 ../src/defaults.c:1773
+#: ../src/defaults.c:2239 ../src/defaults.c:2256 ../src/defaults.c:2269
+#: ../src/defaults.c:2301 ../src/defaults.c:2317 ../src/defaults.c:2348
+#: ../src/defaults.c:2435 ../src/defaults.c:2821 ../src/defaults.c:2832
#, c-format
msgid "using default \"%s\" instead"
-msgstr "benutze Standardeinstellung \"%s\" anderenstatt"
+msgstr "benutze Standardeinstellung \"%s\" anstatt"
-#: ../src/defaults.c:1444
+#: ../src/defaults.c:1530
#, c-format
msgid "wrong option value for key \"%s\". Should be one of %s"
msgstr "falscher Eigenschaftenwert für Schlüssel \"%s\". Wert aus %s erwartet"
-#: ../src/defaults.c:1489
+#: ../src/defaults.c:1575
#, c-format
msgid "can't convert \"%s\" to boolean for key \"%s\""
-msgstr "\"%s\" konnte nicht in Wahrheitswert für Schlüssel \"%s\" konvertiert werden"
+msgstr "\"%s\" konnte nicht in Boolean für Schlüssel \"%s\" konvertiert werden"
-#: ../src/defaults.c:1523
+#: ../src/defaults.c:1607
#, c-format
msgid "can't convert \"%s\" to integer for key \"%s\""
-msgstr "\"%s\" konnte nicht in Ganzzahl für Schlüssel \"%s\" konvertiert werden"
+msgstr "\"%s\" konnte nicht in Integer für Schlüssel \"%s\" konvertiert werden"
-#: ../src/defaults.c:1566
+#: ../src/defaults.c:1649
#, c-format
msgid "Incorrect number of elements in array for key \"%s\"."
msgstr "Falsche Anzahl von Argumenten für Schlüssel \"%s\""
-#: ../src/defaults.c:1581
+#: ../src/defaults.c:1664
#, c-format
msgid "Wrong value for key \"%s\". Should be Coordinate."
-msgstr "Falscher Wert für Schlüssel \"%s\". Koordinate erwartet."
+msgstr "Falscher Wert für Schlüssel \"%s\". Koordinaten erwartet."
-#: ../src/defaults.c:1596
+#: ../src/defaults.c:1679
#, c-format
msgid "can't convert array to integers for \"%s\"."
-msgstr "Feld konnte nicht in Ganzzahlen für \"%s\" konvertiert werden."
+msgstr "Feld konnte nicht in Integer für \"%s\" konvertiert werden."
-#: ../src/defaults.c:1794 ../src/defaults.c:1826 ../src/defaults.c:1842
-#: ../src/defaults.c:1871 ../src/defaults.c:1894 ../src/defaults.c:1947
-#: ../src/defaults.c:1987 ../src/defaults.c:2025 ../src/defaults.c:2041
+#: ../src/defaults.c:1884 ../src/defaults.c:1916 ../src/defaults.c:1932
+#: ../src/defaults.c:1961 ../src/defaults.c:1984 ../src/defaults.c:2037
+#: ../src/defaults.c:2077 ../src/defaults.c:2115 ../src/defaults.c:2131
#, c-format
msgid "\"%s\" is not a valid color name"
msgstr "\"%s\" ist kein gültiger Farbname"
-#: ../src/defaults.c:1807 ../src/defaults.c:1859
+#: ../src/defaults.c:1897 ../src/defaults.c:1949
msgid "bad number of arguments in gradient specification"
msgstr "falsche Anzahl von Argumenten in Farbverlaufsbeschreibung"
-#: ../src/defaults.c:1920
+#: ../src/defaults.c:2010
msgid "too few arguments in multicolor gradient specification"
msgstr "zuwenig Argumente in Mehrfarbverlaufsbeschreibung"
-#: ../src/defaults.c:2014
+#: ../src/defaults.c:2104
msgid "bad number of arguments in textured gradient specification"
msgstr "falsche Anzahl von Argumenten in Texturverlaufsbeschreibung"
-#: ../src/defaults.c:2057
+#: ../src/defaults.c:2147
#, c-format
msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]"
msgstr "falscher Transparenzwert für Textur \"%s\". [0..255] erwartet."
-#: ../src/defaults.c:2117
+#: ../src/defaults.c:2207
#, c-format
msgid "could not initialize library %s"
msgstr "Bibliothek %s konnte nicht initialisiert werden"
-#: ../src/defaults.c:2120
+#: ../src/defaults.c:2210
#, c-format
msgid "could not find function %s::%s"
msgstr "Funktion %s::%s konnte nicht gefunden werden"
-#: ../src/defaults.c:2127
+#: ../src/defaults.c:2217
#, c-format
msgid "invalid texture type %s"
msgstr "ungültiger Texturtyp %s"
-#: ../src/defaults.c:2174
+#: ../src/defaults.c:2264
#, c-format
msgid "Error in texture specification for key \"%s\""
msgstr "fehlerhafte Texturbeschreibung für Schlüssel \"%s\""
-#: ../src/defaults.c:2223
+#: ../src/defaults.c:2313
msgid "Wrong type for workspace background. Should be a texture type."
msgstr "Falscher Typ für Arbeitsflächen-Hintergrund. Textur erwartet."
-#: ../src/defaults.c:2271
+#: ../src/defaults.c:2361
#, c-format
msgid "Wrong type for background of workspace %i. Should be a texture."
msgstr "Falscher Typ für Arbeitsflächen-Hintergrund %i. Textur erwartet."
-#: ../src/defaults.c:2313
+#: ../src/defaults.c:2403
msgid "could not load any usable font!!!"
msgstr "keine brauchbaren Schriften konnten geladen werden!!!"
-#: ../src/defaults.c:2340
+#: ../src/defaults.c:2430
#, c-format
msgid "could not get color for key \"%s\""
msgstr "Farbe für Schlüssel \"%s\" konnte nicht ermittelt werden"
-#: ../src/defaults.c:2398 ../src/rootmenu.c:523
+#: ../src/defaults.c:2488 ../src/rootmenu.c:531
#, c-format
msgid "%s:invalid key modifier \"%s\""
msgstr "%s: ungültiger Schlüsselmodifikator \"%s\""
-#: ../src/defaults.c:2410
+#: ../src/defaults.c:2500
#, c-format
msgid "%s:invalid kbd shortcut specification \"%s\""
msgstr "%s: ungültiges Tastaturkürzel \"%s\""
-#: ../src/defaults.c:2417
+#: ../src/defaults.c:2507
#, c-format
msgid "%s:invalid key in shortcut \"%s\""
-msgstr "%s: ungülige Taste in Kürzel \"%s\""
+msgstr "%s: ungültige Taste in Kürzel \"%s\""
-#: ../src/defaults.c:2442
+#: ../src/defaults.c:2532
#, c-format
msgid "%s: modifier key %s is not valid"
-msgstr "%s: ungültige Umschalttaste %s"
+msgstr "%s: ungültige Tastenmodifikator %s"
-#: ../src/defaults.c:2474
+#: ../src/defaults.c:2564
#, c-format
msgid "could not load image in option %s: %s"
msgstr "Bild aus Eigenschaft %s konnte nicht geladen werden (%s)"
-#: ../src/defaults.c:2591
+#: ../src/defaults.c:2681
#, c-format
msgid "failed to open bitmap file \"%s\""
msgstr "Bitmap-Datei \"%s\" konnte nicht geladen werden"
-#: ../src/defaults.c:2594
+#: ../src/defaults.c:2684
#, c-format
msgid "\"%s\" is not a valid bitmap file"
msgstr "\"%s\" ist keine gültige Bitmap-Datei"
-#: ../src/defaults.c:2597
+#: ../src/defaults.c:2687
#, c-format
msgid "out of memory reading bitmap file \"%s\""
msgstr "zuwenig Speicher beim Lesen der Bitmap \"%s\""
-#: ../src/defaults.c:2636 ../src/defaults.c:2669
+#: ../src/defaults.c:2726 ../src/defaults.c:2759
msgid "bad number of arguments in cursor specification"
msgstr "falsche Anzahl von Argumente in Mauszeigerbeschreibung"
-#: ../src/defaults.c:2652
+#: ../src/defaults.c:2742
#, c-format
msgid "unknown builtin cursor name \"%s\""
msgstr "unbekannter interner Mauszeiger \"%s\""
-#: ../src/defaults.c:2679 ../src/defaults.c:2691
+#: ../src/defaults.c:2769 ../src/defaults.c:2781
#, c-format
msgid "could not find cursor bitmap file \"%s\""
msgstr "Bitmap-Datei \"%s\" konnte nicht geladen werden"
-#: ../src/defaults.c:2738
+#: ../src/defaults.c:2828
#, c-format
msgid "Error in cursor specification for key \"%s\""
msgstr "Fehler in Mauszeigerbeschreibung für Schlüssel \"%s\""
-#: ../src/defaults.c:2823
+#: ../src/defaults.c:2913
msgid "could not render texture for icon background"
msgstr "Textur für Symbolhintergrund konnte nicht angezeigt werden"
-#: ../src/dialog.c:135
+#: ../src/defaults.c:3541 ../src/defaults.c:3616
+#, c-format
+msgid "Invalid arguments for option \"%s\""
+msgstr "Falsche Argument für Option \"%s\""
+
+#: ../src/defaults.c:3548 ../src/defaults.c:3623
+#, c-format
+msgid "Could not find image \"%s\" for option \"%s\""
+msgstr "Bild \"%s\" aus Eigenschaft \"%s\" konnte nicht gefunden werden"
+
+#: ../src/defaults.c:3554 ../src/defaults.c:3631
+#, c-format
+msgid "Could not load image \"%s\" for option \"%s\""
+msgstr "Bild \"%s\"aus Eigenschaft \"%s\" konnte nicht geladen werden"
+
+#: ../src/defaults.c:3566
+msgid "Invalid split sizes for SwitchPanel back image."
+msgstr "Ungültige Unterteilungsangaben für SwitchPanel-Hintergrundbild."
+
+#: ../src/defaults.c:3639
+#, c-format
+msgid "Invalid number of arguments for option \"%s\""
+msgstr "Falsche Anzahl von Argumente für Option \"%s\""
+
+#: ../src/dialog.c:147
msgid "Save workspace state"
msgstr "Sitzung speichern"
-#: ../src/dialog.c:173 ??
-msgid "Shutdown Computer"
-msgstr "Computer herunterfahren"
-
-#: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558
-#: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248
+#: ../src/dialog.c:192 ../src/dialog.c:732 ../src/dock.c:547
+#: ../src/dockedapp.c:432 ../src/rootmenu.c:198 ../src/rootmenu.c:248
#: ../src/rootmenu.c:264
msgid "Cancel"
msgstr "Abbrechen"
-#: ../src/dialog.c:277
+#: ../src/dialog.c:290
msgid "Could not open directory "
msgstr "Verzeichnis konnte nicht geöffnet werden"
-#: ../src/dialog.c:332
+#: ../src/dialog.c:345
msgid "Could not load image file "
msgstr "Bilddatei konnte nicht geöffnet werden"
-#: ../src/dialog.c:663
+#: ../src/dialog.c:659
msgid "Directories"
msgstr "Verzeichnisse"
-#: ../src/dialog.c:672
+#: ../src/dialog.c:668
msgid "Icons"
msgstr "Symbole"
-#: ../src/dialog.c:705
+#: ../src/dialog.c:701
msgid "Preview"
msgstr "Vorschau"
-#: ../src/dialog.c:718
+#: ../src/dialog.c:714
msgid "File Name:"
msgstr "Dateiname:"
-#: ../src/dialog.c:742
+#: ../src/dialog.c:738
msgid "Choose File"
msgstr "Datei auswählen"
-#: ../src/dialog.c:760 ../src/dialog.c:762
+#: ../src/dialog.c:757 ../src/dialog.c:759
msgid "Icon Chooser"
msgstr "Symbol-Wähler"
-#: ../src/dialog.c:1241 ../src/dialog.c:1351
+#: ../src/dialog.c:1196 ../src/dialog.c:1304
#, c-format
msgid "Version %s"
msgstr "Version %s"
-#: ../src/dialog.c:1348
+#: ../src/dialog.c:1302
msgid "Window Manager for X"
msgstr "Windowmanager für X"
-#: ../src/dialog.c:1371
+#: ../src/dialog.c:1325
#, c-format
msgid "Using visual 0x%x: %s %ibpp "
msgstr "Benutze Visual 0x%x %s %ibpp "
-#: ../src/dialog.c:1379
+#: ../src/dialog.c:1333
msgid "(32 thousand colors)\n"
msgstr "(32.000 Farben)\n"
-#: ../src/dialog.c:1382
+#: ../src/dialog.c:1336
msgid "(64 thousand colors)\n"
msgstr "(64.000 Farben)\n"
-#: ../src/dialog.c:1386
+#: ../src/dialog.c:1340
msgid "(16 million colors)\n"
msgstr "(16 Millionen Farben)\n"
-#: ../src/dialog.c:1389
+#: ../src/dialog.c:1343
#, c-format
msgid "(%d colors)\n"
msgstr "(%d Farben)\n"
-#: ../src/dialog.c:1399
+#: ../src/dialog.c:1353
#, c-format
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n"
msgstr "Gesamter belegter Speicher: %i kB. Gesamter benutzter Speicher: %i kB.\n"
-#: ../src/dialog.c:1406
+#: ../src/dialog.c:1360
msgid "Supported image formats: "
msgstr "Unterstütze Grafikformate: "
-#: ../src/dialog.c:1413
+#: ../src/dialog.c:1367
msgid ""
"\n"
"Additional support for: "
@@ -387,11 +418,11 @@
"\n"
"Zusätzliche Unterstützung für: "
-#: ../src/dialog.c:1436
+#: ../src/dialog.c:1384
msgid " and "
msgstr " und "
-#: ../src/dialog.c:1446
+#: ../src/dialog.c:1394
msgid ""
"\n"
"Sound disabled"
@@ -399,7 +430,7 @@
"\n"
"Ton ausgeschaltet"
-#: ../src/dialog.c:1448
+#: ../src/dialog.c:1396
msgid ""
"\n"
"Sound enabled"
@@ -407,89 +438,105 @@
"\n"
"Ton eingeschaltet"
-#: ../src/dialog.c:1472
+#: ../src/dialog.c:1401
+msgid ", VirtualDesktop enabled"
+msgstr ", VirtualDesktop aktiviert"
+
+#: ../src/dialog.c:1403
+msgid ", VirtualDesktop disabled"
+msgstr ", VirtualDesktop deaktiviert"
+
+#: ../src/dialog.c:1407
+msgid "\n"
+msgstr ""
+
+#: ../src/dialog.c:1409
+msgid "Solaris "
+msgstr ""
+
+#: ../src/dialog.c:1411
+msgid "Xinerama: "
+msgstr ""
+
+#: ../src/dialog.c:1445
msgid "Info"
msgstr "Info"
-#: ../src/dialog.c:1495
+#: ../src/dialog.c:1469
msgid "Merry Christmas!"
msgstr "Frohe Weihnachten!"
-#: ../src/dialog.c:1565
+#: ../src/dialog.c:1539
msgid ""
" Window Maker is free software; you can redistribute it and/or\n"
"modify it under the terms of the GNU General Public License as\n"
"published by the Free Software Foundation; either version 2 of the\n"
"License, or (at your option) any later version.\n"
"\n"
-"\n"
" Window Maker is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty\n"
"of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"See the GNU General Public License for more details.\n"
"\n"
-"\n"
" You should have received a copy of the GNU General Public\n"
"License along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
"02111-1307, USA."
msgstr ""
-#: ../src/dialog.c:1586
+#: ../src/dialog.c:1563
msgid "Legal"
msgstr "Rechtliches"
-#: ../src/dialog.c:1737 ../src/startup.c:395
+#: ../src/dialog.c:1719
msgid "cannot open connection for crashing dialog panel. Aborting."
-msgstr "Verbindung zum Absturz-Dialog konnte nicht erstellt werden"
+msgstr "Verbindung zum Absturz-Dialog konnte nicht erstellt werden. Abbruch."
-#: ../src/dialog.c:1763
+#: ../src/dialog.c:1745
msgid "Fatal error"
msgstr "Fataler Fehler"
-#: ../src/dialog.c:1774
+#: ../src/dialog.c:1756
#, c-format
msgid ""
"Window Maker received signal %i\n"
"(%s)."
msgstr ""
-"Window Maker erhielt Signale %i\n"
+"Window Maker erhielt Signal %i\n"
"(%s)."
-#: ../src/dialog.c:1777
+#: ../src/dialog.c:1759
#, c-format
msgid "Window Maker received signal %i."
msgstr "Window Maker erhielt Signal %i"
-#: ../src/dialog.c:1786
+#: ../src/dialog.c:1768
msgid ""
" This fatal error occured probably due to a bug. Please fill the included "
"BUGFORM and report it to bugs@windowmaker.org."
-msgstr ""
-" Dieser fatale Fehler trat möglicherweise aufgrund eines Programmfehlers auf. Bitte füllen Sie die "
-"mitgelieferte BUGFORM aus und schicken sie an bugs@windowmaker.org"
+msgstr " Dieser fatale Fehler trat möglicherweise wegen eines Bugs auf. Bitte füllen Sie die mitgelieferte BUGFORM aus und schicken Sie sie an bugs@windowmaker.org."
-#: ../src/dialog.c:1795
+#: ../src/dialog.c:1777
msgid "What do you want to do now?"
msgstr "Was möchten Sie jetzt tun?"
-#: ../src/dialog.c:1801
+#: ../src/dialog.c:1783
msgid "Select action"
msgstr "Aktion auswählen"
-#: ../src/dialog.c:1802
+#: ../src/dialog.c:1784
msgid "Abort and leave a core file"
msgstr "Abbrechen und Core-Datei hinterlassen"
-#: ../src/dialog.c:1803
+#: ../src/dialog.c:1785
msgid "Restart Window Maker"
msgstr "Window Maker neustarten"
-#: ../src/dialog.c:1804
+#: ../src/dialog.c:1786
msgid "Start alternate window manager"
msgstr "Anderen Windowmanager starten"
-#: ../src/dialog.c:1982
+#: ../src/dialog.c:1964
msgid ""
"Window Maker is part of the GNUstep project.\n"
"The GNUstep project aims to create a free\n"
@@ -510,567 +557,507 @@
"erstellt. Für weitere Informationen zu GNUstep besuchen\n"
"sie bitte www.gnustep.org"
-#: ../src/dialog.c:2002
+#: ../src/dialog.c:1987
msgid "About GNUstep"
msgstr "Über GNUStep"
-#: ../src/dock.c:213
+#: ../src/dock.c:193
#, c-format
msgid "Type the name for workspace %i:"
-msgstr "Geben sie den Namen der Arbeitsfläche %i ein:"
+msgstr "Geben Sie den Namen der Arbeitsfläche %i ein:"
-#: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409
+#: ../src/dock.c:194 ../src/dock.c:1132 ../src/dock.c:1135 ../src/dock.c:3419
msgid "Rename Workspace"
msgstr "Arbeitsfläche umbenennen"
-#: ../src/dock.c:520 ../src/dock.c:528
+#: ../src/dock.c:509 ../src/dock.c:517
msgid "Warning"
msgstr "Warnung"
-#: ../src/dock.c:521
+#: ../src/dock.c:510
msgid ""
"Some icons cannot be made omnipresent. Please make sure that no other icon "
"is docked in the same positions on the other workspaces and the Clip is not "
"full in some workspace."
msgstr ""
-"Einige Symbole konnten nicht haftend gemacht werden. Bitte stellen Sie sicher, "
-"dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position andockt "
-"und der Clip in keiner Arbeitsfläche voll ist."
+"Einige Symbole konnten nicht haftend gemacht werden. Bitte stellen Sie "
+"sicher, dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen "
+"Position andockt und der Clip in keiner Arbeitsfläche voll ist."
-#: ../src/dock.c:529
+#: ../src/dock.c:518
msgid ""
"Icon cannot be made omnipresent. Please make sure that no other icon is "
"docked in the same position on the other workspaces and the Clip is not full "
"in some workspace."
msgstr ""
-"Symbol konntennicht haftend gemacht werden. Bitte stellen Sie sicher, "
-"dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position klebt "
+"Symbol konnte nicht haftend gemacht werden. Bitte stellen Sie sicher, dass "
+"kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position klebt "
"und der Clip in keiner Arbeitsfläche voll ist."
-#: ../src/dock.c:556
+#: ../src/dock.c:545
msgid "Workspace Clip"
msgstr "Arbeitsflächen-Clip"
-#: ../src/dock.c:557
+#: ../src/dock.c:546
msgid "All selected icons will be removed!"
msgstr "Alle ausgewählten Symbole werden entfernt!"
-#: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445
+#: ../src/dock.c:598 ../src/dock.c:1147 ../src/dock.c:1149 ../src/dock.c:3455
msgid "Keep Icon"
msgstr "Symbol behalten"
-#: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278
+#: ../src/dock.c:599 ../src/dock.c:2139 ../src/dock.c:2276
msgid "Type the command used to launch the application"
msgstr "Geben Sie den Befehl zum Starten der Anwendung ein"
-#: ../src/dock.c:965
+#: ../src/dock.c:954
#, c-format
msgid "could not launch application %s\n"
msgstr "Anwendung %s konnte nicht gestartet werden\n"
-#: ../src/dock.c:1020
+#: ../src/dock.c:1010
msgid "could not create workspace submenu for Clip menu"
msgstr "Arbeitsflächen-Untermenü für Clip konnte nicht erstellt werden"
-#: ../src/dock.c:1078
+#: ../src/dock.c:1069
msgid "could not create options submenu for Clip menu"
msgstr "Eigenschaften-Menü für Clip konnte nicht erstellt werden"
-#: ../src/dock.c:1082 ../src/dock.c:1130
+#: ../src/dock.c:1073 ../src/dock.c:1121
msgid "Keep on Top"
msgstr "Immer oben"
-#: ../src/dock.c:1088
+#: ../src/dock.c:1079
msgid "Collapsed"
msgstr "Zusammengefaltet"
-#: ../src/dock.c:1094
+#: ../src/dock.c:1085
msgid "Autocollapse"
msgstr "Automatisch zusammenfalten"
-#: ../src/dock.c:1100
+#: ../src/dock.c:1091
msgid "Autoraise"
msgstr "Automatisch oben"
-#: ../src/dock.c:1106
+#: ../src/dock.c:1097
msgid "Autoattract Icons"
msgstr "Symbole automatisch anziehen"
-#: ../src/dock.c:1136
+#: ../src/dock.c:1127
msgid "Clip Options"
msgstr "Clip-Optionen"
-#: ../src/dock.c:1146
+#: ../src/dock.c:1137
msgid "Selected"
msgstr "Ausgewählt"
-#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436
+#: ../src/dock.c:1142 ../src/dock.c:1145 ../src/dock.c:3446
msgid "Select All Icons"
msgstr "Alle Symbole auswählen"
-#: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453
+#: ../src/dock.c:1151 ../src/dock.c:1153 ../src/dock.c:3463
msgid "Move Icon To"
msgstr "Verschiebe Symbol nach..."
-#: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464
+#: ../src/dock.c:1158 ../src/dock.c:1161 ../src/dock.c:3474
msgid "Remove Icon"
msgstr "Entferne Symbol"
-#: ../src/dock.c:1172
+#: ../src/dock.c:1163
msgid "Attract Icons"
msgstr "Symbole anziehen"
-#: ../src/dock.c:1175
+#: ../src/dock.c:1166
msgid "Launch"
-msgstr "Starten"
+msgstr "Ausführen"
-#: ../src/dock.c:1183
+#: ../src/dock.c:1174
msgid "Settings..."
msgstr "Einstellungen..."
-#: ../src/dock.c:1548 ../src/dock.c:1655
+#: ../src/dock.c:1538 ../src/dock.c:1645
#, c-format
msgid "bad value in docked icon state info %s"
msgstr "falscher Wert für Statusinfo %s des angedockten Symbols"
-#: ../src/dock.c:1663
+#: ../src/dock.c:1653
#, c-format
msgid "bad value in docked icon position %i,%i"
msgstr "falscher Wert für Position eines angedockten Symbols: %i,%i"
-#: ../src/dock.c:1683
+#: ../src/dock.c:1673
#, c-format
msgid "bad value in dock state info:%s"
msgstr "falscher Wert in Dock-Statusinfo: %s"
-#: ../src/dock.c:1919
+#: ../src/dock.c:1923
msgid "there are too many icons stored in dock. Ignoring what doesn't fit"
msgstr "zu viele Symbole im Dock, überzählige werden ignoriert"
#. icon->forced_dock = 1;
-#: ../src/dock.c:2136 ../src/dock.c:2277
+#: ../src/dock.c:2138 ../src/dock.c:2275
msgid "Dock Icon"
msgstr "Dock-Symbol"
-#: ../src/dock.c:3323
+#: ../src/dock.c:3333
#, c-format
msgid "Could not execute command \"%s\""
msgstr "Befehl \"%s\" konnte nicht ausgeführt werden"
-#: ../src/dock.c:3415
+#: ../src/dock.c:3425
msgid "Toggle Omnipresent"
msgstr "Haftend ein/aus"
-#: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:413
-#: ../src/winspector.c:1375
+#: ../src/dock.c:3430 ../src/winmenu.c:414 ../src/winspector.c:1383
msgid "Omnipresent"
msgstr "Haftend"
-#: ../src/dock.c:3434
+#: ../src/dock.c:3444
msgid "Unselect All Icons"
msgstr "Alle Symbole abwählen"
-#: ../src/dock.c:3443
+#: ../src/dock.c:3453
msgid "Keep Icons"
msgstr "Symbole behalten"
-#: ../src/dock.c:3451
+#: ../src/dock.c:3461
msgid "Move Icons To"
msgstr "Verschiebe Symbole nach"
-#: ../src/dock.c:3462
+#: ../src/dock.c:3472
msgid "Remove Icons"
msgstr "Symbole entfernen"
-#: ../src/dock.c:3493 ../src/kwm.c:643
+#: ../src/dock.c:3503
msgid "Bring Here"
msgstr "Hierher holen"
-#: ../src/dockedapp.c:149
+#: ../src/dockedapp.c:150
#, c-format
msgid "could not find icon %s, used in a docked application"
msgstr "Symbol %s für gedockte Anwendung konnte nicht gefunden"
-#: ../src/dockedapp.c:229
+#: ../src/dockedapp.c:230
#, c-format
msgid "Could not open specified icon file: %s"
msgstr "Symboldatei %s konnte nicht geöffnet werden"
-#: ../src/dockedapp.c:231
+#: ../src/dockedapp.c:232
msgid "Ignore"
msgstr "Ignorieren"
-#: ../src/dockedapp.c:333
+#: ../src/dockedapp.c:334
msgid "Start when Window Maker is started"
msgstr "Autostart"
-#: ../src/dockedapp.c:340
+#: ../src/dockedapp.c:341
msgid "Lock (prevent accidental removal)"
msgstr "Festhalten (kein versehentliches Entfernen)"
-#: ../src/dockedapp.c:344
+#: ../src/dockedapp.c:345
msgid "Application path and arguments"
msgstr "Anwendungspfad und -argumente"
-#: ../src/dockedapp.c:357
+#: ../src/dockedapp.c:358
msgid "Command for middle-click launch"
msgstr "Befehl für Klick mit mittlerer Maustaste"
-#: ../src/dockedapp.c:371
+#: ../src/dockedapp.c:372
#, c-format
msgid "%s will be replaced with current selection"
msgstr "%s wird durch die aktuelle Auswahl ersetzt"
-#: ../src/dockedapp.c:376
+#: ../src/dockedapp.c:377
msgid "Command for files dropped with DND"
msgstr "Befehl für per DND-Operationen"
-#: ../src/dockedapp.c:390
+#: ../src/dockedapp.c:391
#, c-format
msgid "%d will be replaced with the file name"
msgstr "%d wird durch den Dateinamen ersetzt"
-#: ../src/dockedapp.c:394
+#: ../src/dockedapp.c:395
msgid "DND support was not compiled in"
msgstr "keine einkompilierte DND-Unterstützung"
-#: ../src/dockedapp.c:399
+#: ../src/dockedapp.c:400
msgid "Icon Image"
msgstr "Symbol"
-#: ../src/dockedapp.c:413 ../src/winspector.c:1513
+#: ../src/dockedapp.c:414 ../src/winspector.c:1521
msgid "Browse..."
msgstr "Suchen..."
-#: ../src/dockedapp.c:466
+#: ../src/dockedapp.c:475
msgid "Docked Application Settings"
msgstr "Einstellungen für gedockte Anwendungen"
-#: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:456
+#: ../src/framewin.c:647 ../src/framewin.c:742 ../src/menu.c:463
#: ../src/texture.c:594
#, c-format
msgid "could not render texture: %s"
msgstr "Textur %s konnte nicht angezeigt werden"
-#: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699
-#: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724
-#: ../src/icon.c:350 ../src/menu.c:485
+#: ../src/framewin.c:670 ../src/framewin.c:681 ../src/framewin.c:697
+#: ../src/framewin.c:708 ../src/framewin.c:715 ../src/framewin.c:722
+#: ../src/icon.c:360 ../src/menu.c:492
#, c-format
msgid "error rendering image:%s"
msgstr "Fehler beim Anzeigen des Bildes: %s"
-#: ../src/framewin.c:777
+#: ../src/framewin.c:775
#, c-format
msgid "error rendering image: %s"
msgstr "Fehler beim Anzeigen des Bildes: %s"
-#: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401
-msgid "out of memory while updating GNOME hints"
-msgstr "zuwenig Speicher beim Erneuern der GNOME-Hinweise"
-
-#: ../src/icon.c:229 ../src/wdefaults.c:443
+#: ../src/icon.c:239 ../src/wdefaults.c:443
#, c-format
msgid "error loading image file \"%s\""
msgstr "Fehler beim Laden der Bilddatei \"%s\""
-#: ../src/icon.c:491 ../src/icon.c:500
+#: ../src/icon.c:503 ../src/icon.c:512
#, c-format
msgid "could not create directory %s"
msgstr "Vezeichnis %s konnte nicht erstellt werden"
-#: ../src/icon.c:767
+#: ../src/icon.c:782
#, c-format
msgid "could not find default icon \"%s\""
msgstr "Standardsymbol \"%s\" konnte nicht gefunden werden"
-#: ../src/icon.c:773
+#: ../src/icon.c:788
#, c-format
msgid "could not load default icon \"%s\":%s"
msgstr "Standardsymbol \"%s\" (%s) konnte nicht geöffnet werden"
-#.
-#. * Warning: If you make some change that affects the order of the
-#. * entries, you must update the command #defines in the top of
-#. * this file.
-#.
-#: ../src/kwm.c:633 ../src/winmenu.c:436 ../src/winmenu.c:571
-msgid "Maximize"
-msgstr "Maximieren"
-
-#: ../src/kwm.c:634 ../src/winmenu.c:566
-msgid "Unmaximize"
-msgstr "Ursprüngliche Größe"
-
-#: ../src/kwm.c:635 ../src/winmenu.c:444 ../src/winmenu.c:557
-msgid "Miniaturize"
-msgstr "Minimieren"
-
-#: ../src/kwm.c:636 ../src/winmenu.c:552
-msgid "Deminiaturize"
-msgstr "Wiederherstellen"
-
-#: ../src/kwm.c:638
-msgid "Not Omnipresent"
-msgstr "Nicht haftend"
-
-#: ../src/kwm.c:639
-msgid "Move"
-msgstr "Bewegen"
-
-#: ../src/kwm.c:640
-msgid "Resize"
-msgstr "Größe ändern"
-
-#.
-#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
-#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
-#.
-#: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:501
-msgid "Close"
-msgstr "Schließen"
-
-#: ../src/kwm.c:642 ../src/winmenu.c:485
-msgid "Move To"
-msgstr "Bewegen nach..."
-
-#: ../src/kwm.c:1096
-msgid "%a(Run Command,Type the command to run:)"
-msgstr "%a (Befehl zum Ausführen eintippen)"
-
-#: ../src/main.c:222
+#: ../src/main.c:220
msgid "failed to restart Window Maker."
msgstr "Window Maker-Neustart schlug fehl"
-#: ../src/main.c:225
+#: ../src/main.c:223
#, c-format
msgid "could not exec %s"
msgstr "%s konnte nicht ausgeführt werden"
-#: ../src/main.c:271
+#: ../src/main.c:269
msgid "Could not execute command: "
msgstr "Befehl konnte nicht ausgeführt werden: "
-#: ../src/main.c:428
+#: ../src/main.c:426
#, c-format
msgid "%s aborted.\n"
msgstr "%s wurde abgebrochen.\n"
-#: ../src/main.c:439
+#: ../src/main.c:437
#, c-format
msgid "Usage: %s [options]\n"
msgstr "Benutzung: %s [Optionen]\n"
-#: ../src/main.c:440
+#: ../src/main.c:438
msgid "The Window Maker window manager for the X window system"
-msgstr "Der Window Maker Windowmanager für das X-Window System"
+msgstr "Der Window Maker-Windowmanager für das X-Window System"
-#: ../src/main.c:442
+#: ../src/main.c:440
msgid " -display host:dpy\tdisplay to use"
msgstr " -display host:dpy\tverwendetes Display"
-#: ../src/main.c:444
+#: ../src/main.c:442
msgid " --no-cpp \t\tdisable preprocessing of configuration files"
-msgstr " --no-cpp \t\tkein Abarbeiten der Konfigurationsdateien"
+msgstr " --no-cpp \t\tkein Präprozessieren der Konfigurationsdateien"
-#: ../src/main.c:446
+#: ../src/main.c:444
msgid " --no-dock\t\tdo not open the application Dock"
msgstr " --no-dock\t\tAnwendungsdock nicht öffnen"
-#: ../src/main.c:447
+#: ../src/main.c:445
msgid " --no-clip\t\tdo not open the workspace Clip"
msgstr " --no-clip\t\tArbeitsflächen-Clip nicht öffnen"
-#: ../src/main.c:448
+#: ../src/main.c:446
msgid " --no-autolaunch\tdo not autolaunch applications"
-msgstr " --no-autolaunch\tkein Anwendungs-Autostart"
+msgstr " --no-autolaunch\tkein Autostart von Anwendungen"
-#: ../src/main.c:449
+#: ../src/main.c:447
msgid " --dont-restore\t\tdo not restore saved session"
msgstr " --dont-restore\t\tgespeicherte Sitzung nicht wiederherstellen"
-#: ../src/main.c:451
+#: ../src/main.c:449
msgid " --locale locale\tlocale to use"
-msgstr " --locale locale\tbenutzte Lokale"
+msgstr " --locale locale\tzu benutzende Lokalisierung"
-#: ../src/main.c:453
+#: ../src/main.c:451
msgid " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals"
-msgstr " --create-stdcmap\terstelle Hinweise für Standardfarben-Tabelle mit Pseudofarben"
+msgstr ""
+" --create-stdcmap\terstelle Hinweise für Standardfarben-Tabelle mit "
+"Pseudofarben"
-#: ../src/main.c:454
+#: ../src/main.c:452
msgid " --visual-id visualid\tvisual id of visual to use"
msgstr " --visual-id visualid\tID des zu benutzenden Visuals"
-#: ../src/main.c:455
+#: ../src/main.c:453
msgid " --static\t\tdo not update or save configurations"
msgstr " --static\t\tKonfiguration nicht ändern oder speichern"
-#: ../src/main.c:456
+#: ../src/main.c:454
msgid " --no-polling\t\tdo not periodically check for configuration updates"
msgstr " --no-polling\t\tnicht periodisch auf Konfigurationsänderungen testen"
-#: ../src/main.c:458
+#: ../src/main.c:456
msgid " --synchronous\t\tturn on synchronous display mode"
msgstr " --synchronous\t\tsnychronen Display-Modus einschalten"
-#: ../src/main.c:460
+#: ../src/main.c:458
msgid " --version\t\tprint version and exit"
msgstr " --version\t\tVersion anzeigen und beenden"
-#: ../src/main.c:461
+#: ../src/main.c:459
msgid " --help\t\t\tshow this message"
msgstr " --help\t\t\tdiese Nachricht anzeigen"
-#: ../src/main.c:474
+#: ../src/main.c:473
#, c-format
msgid ""
"could not find user GNUstep directory (%s).\n"
"Make sure you have installed Window Maker correctly and run wmaker.inst"
msgstr ""
"GNUstep-Verzeichnis (%s) konnte nicht gefunden werden.\n"
-"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker.inst aufgerufen haben"
+"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker."
+"inst aufgerufen haben"
-#: ../src/main.c:479
+#: ../src/main.c:478
#, c-format
msgid "could not find user GNUstep directory (%s)."
msgstr "GNUstep-Verzeichnis (%s) konnte nicht gefunden werden."
-#: ../src/main.c:482
+#: ../src/main.c:481
msgid ""
"There was an error while creating GNUstep directory, please make sure you "
"have installed Window Maker correctly and run wmaker.inst"
msgstr ""
-"Während der Erstellung der GNUstep-Verzeichnisses ist ein Fehler aufgetreten, "
-"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker.inst aufgerufen haben"
+"Während der Erstellung der GNUstep-Verzeichnisses ist ein Fehler "
+"aufgetreten, Stellen Sie sicher, dass sie Window Maker korrekt installiert "
+"und wmaker.inst aufgerufen haben"
-#: ../src/main.c:485
+#: ../src/main.c:484
#, c-format
msgid "%s directory created with default configuration."
msgstr "Verzeichnis %s wurde mit Standardkonfiguration erstellt"
-#: ../src/main.c:505 ../src/main.c:510
+#: ../src/main.c:506 ../src/main.c:511
#, c-format
msgid "%s:could not execute initialization script"
msgstr "%s:Initialisierungsskript konnte nicht ausgeführt werden"
-#: ../src/main.c:530 ../src/main.c:535
+#: ../src/main.c:533 ../src/main.c:538
#, c-format
msgid "%s:could not execute exit script"
msgstr "%s: Beendigungsskript konnte nicht ausgeführt werden"
-#: ../src/main.c:651 ../src/main.c:659 ../src/main.c:667 ../src/main.c:687
+#: ../src/main.c:622 ../src/main.c:722 ../src/main.c:730 ../src/main.c:738
+#: ../src/main.c:758
#, c-format
msgid "too few arguments for %s"
msgstr "zuwenig Argumente für %s"
-#: ../src/main.c:671
+#: ../src/main.c:742
#, c-format
msgid "bad value for visualid: \"%s\""
msgstr "falscher Wert für Visual-ID: \"%s\""
-#: ../src/main.c:695
+#: ../src/main.c:766
#, c-format
msgid "%s: invalid argument '%s'\n"
msgstr "%s: falsches Argument '%s'\n"
-#: ../src/main.c:696
+#: ../src/main.c:767
#, c-format
msgid "Try '%s --help' for more information\n"
msgstr "Versuchen Sie '%s --help' für mehr Informationen\n"
-#: ../src/main.c:727
+#: ../src/main.c:802
msgid "X server does not support locale"
-msgstr "X-Server unterstützt keine Locales"
+msgstr "X-Server unterstützt gewählte Lokalisierung nicht"
-#: ../src/main.c:731
+#: ../src/main.c:806
msgid "cannot set locale modifiers"
-msgstr "Lokalen-Modifikator konnte nicht gesetzt werden"
+msgstr "Lokalisierungs-Modifikator konnte nicht gesetzt werden"
-#: ../src/main.c:747
+#: ../src/main.c:822
#, c-format
msgid "could not open display \"%s\""
msgstr "Display \"%s\" konnte nicht geöffnet werden"
-#: ../src/menu.c:1255
+#: ../src/menu.c:1276
msgid "could not grab keyboard"
msgstr "Tastatur konnte nicht abfangen werden"
-#: ../src/menu.c:2569
+#: ../src/menu.c:2615
#, c-format
msgid "bad value in menus state info:%s"
msgstr "falsche Werte in Menü-Statusinfo: %s"
-#: ../src/misc.c:71
+#: ../src/misc.c:65
#, c-format
msgid "could not define value for %s for cpp"
-msgstr "Wert für %s für cpp konnte nicht definiert werden"
+msgstr "Wert des Symbols %s für cpp konnte nicht definiert werden"
-#: ../src/misc.c:101
+#: ../src/misc.c:95
#, c-format
msgid "could not get password entry for UID %i"
-msgstr "Passwort für UID %i konnte nicht ermittelt werden"
+msgstr "Passworteintrag für UID %i konnte nicht ermittelt werden"
-#: ../src/misc.c:126
+#: ../src/misc.c:120
#, c-format
msgid "your machine is misconfigured. HOSTNAME is set to %s"
msgstr "Ihr System ist falsch konfiguriert. HOSTNAME wird auf %s gesetzt."
-#: ../src/misc.c:132
+#: ../src/misc.c:126
#, c-format
msgid "your machine is misconfigured. HOST is set to %s"
msgstr "Ihr System ist falsch konfiguriert. HOST wird auf %s gesetzt."
-#: ../src/misc.c:630
+#: ../src/misc.c:621
msgid "Program Arguments"
msgstr "Programmargumente"
-#: ../src/misc.c:631
+#: ../src/misc.c:622
msgid "Enter command arguments:"
msgstr "Programmargumente eintragen"
-#: ../src/misc.c:724
-msgid "unable to get dropped data from DND drop"
-msgstr "Daten der DND-Operation konnten nicht ermittelt werden"
-
-#: ../src/misc.c:732
-msgid "error getting dropped data from DND drop"
-msgstr "beim Ermitteln der Daten der DND-Operation ist ein Fehler aufgetreten"
-
-#: ../src/misc.c:738
-msgid "out of memory while getting data from DND drop"
-msgstr "zuwenig Speicher beim Ermitteln der Daten der DND-Operation"
-
-#: ../src/misc.c:783 ../src/misc.c:923
+#: ../src/misc.c:736 ../src/misc.c:874
#, c-format
msgid "out of memory during expansion of \"%s\""
msgstr "zuwenig Speicher bei der Expansion von \"%s\""
-#: ../src/misc.c:837
+#: ../src/misc.c:790
msgid "out of memory during expansion of \"%w\""
msgstr "zuwenig Speicher bei der Expansion von \"%w\""
-#: ../src/misc.c:855
+#: ../src/misc.c:808
msgid "out of memory during expansion of \"%W\""
msgstr "zuwenig Speicher bei der Expansion von \"%W\""
-#: ../src/misc.c:871
+#: ../src/misc.c:824
+#, c-format
msgid "out of memory during expansion of \"%a\""
msgstr "zuwenig Speicher bei der Expansion von \"%a\""
-#: ../src/misc.c:902
+#: ../src/misc.c:853
#, c-format
msgid "out of memory during expansion of \"%d\""
msgstr "zuwenig Speicher bei der Expansion von \"%d\""
-#: ../src/misc.c:916
+#: ../src/misc.c:867
msgid "selection not available"
msgstr "keine Auswahl verfügbar"
-#: ../src/misc.c:972 ../src/misc.c:978
+#: ../src/misc.c:911 ../src/misc.c:917
#, c-format
msgid "bad window name value in %s state info"
msgstr "falscher Fenstername in Statusinfo von %s"
-#: ../src/misc.c:1235
+#: ../src/misc.c:1156
msgid "could not send message to background image helper"
msgstr "Nachricht an Hintergrundbild-Anwendung konnte nicht gesendet werden"
@@ -1109,6 +1096,14 @@
"Windowsystem-Sitzung beenden?\n"
"Ungespeicherte Daten in Anwendungen können verloren gehen."
+#.
+#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
+#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
+#.
+#: ../src/rootmenu.c:248 ../src/winmenu.c:501
+msgid "Close"
+msgstr "Schließen"
+
#: ../src/rootmenu.c:261
msgid "Kill X session"
msgstr "Töte X-Sitzung"
@@ -1121,194 +1116,200 @@
"Windowsystem-Sitzung töten?\n"
"(alle Anwendungen werden geschlossen)"
-#: ../src/rootmenu.c:536
+#: ../src/rootmenu.c:544
#, c-format
msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s"
msgstr "%s: ungültiges Tastaturkürzel \"%s\" für Eintrag %s"
-#: ../src/rootmenu.c:544
+#: ../src/rootmenu.c:552
#, c-format
msgid "%s:invalid key in shortcut \"%s\" for entry %s"
msgstr "%s: ungültige Taste in Kürzel \"%s\" für Eintrag %s"
-#: ../src/rootmenu.c:597
+#: ../src/rootmenu.c:605
#, c-format
msgid "%s: unmatched '\"' in menu file"
msgstr "%s: fehlendes \" in Menüdatei"
-#: ../src/rootmenu.c:647
+#: ../src/rootmenu.c:655
#, c-format
msgid "%s: missing command"
msgstr "%s: fehlender Befehl"
-#: ../src/rootmenu.c:679
+#: ../src/rootmenu.c:687
#, c-format
msgid "invalid OPEN_MENU specification: %s"
msgstr "ungültige OPEN_MENU-Beschreibung: %s"
-#: ../src/rootmenu.c:730
+#: ../src/rootmenu.c:738
#, c-format
msgid "%s:could not stat menu"
msgstr "%s: Menü konnte nicht erzeugt werden"
-#: ../src/rootmenu.c:738
+#: ../src/rootmenu.c:746
#, c-format
msgid "%s:could not stat menu:%s"
msgstr "%s: Menü konnte nicht erzeugt werden: %s"
-#: ../src/rootmenu.c:756
+#: ../src/rootmenu.c:764
#, c-format
msgid "too many parameters in OPEN_MENU: %s"
msgstr "zuviele Parameter in OPEN_MENU: %s"
-#: ../src/rootmenu.c:800
+#: ../src/rootmenu.c:808
msgid ""
"There are more than one WORKSPACE_MENU commands in the applications menu. "
"Only one is allowed."
-msgstr "Im Anwendungsmenü ist mehr als ein WORKSPACE_MENU-Eintrag, aber nur einer ist erlaubt."
+msgstr ""
+"Im Anwendungsmenü ist mehr als ein WORKSPACE_MENU-Eintrag, aber nur einer "
+"ist erlaubt."
-#: ../src/rootmenu.c:834
+#: ../src/rootmenu.c:842
msgid ""
"There are more than one WINDOWS_MENU commands in the applications menu. Only "
"one is allowed."
-msgstr "Im Anwendungsmenü ist mehr als ein WINDOWS_MENU-Eintrag, aber nur einer ist erlaubt."
+msgstr ""
+"Im Anwendungsmenü ist mehr als ein WINDOWS_MENU-Eintrag, aber nur einer ist "
+"erlaubt."
-#: ../src/rootmenu.c:839
+#: ../src/rootmenu.c:847
msgid "Window List"
msgstr "Fenster-Liste"
-#: ../src/rootmenu.c:868 ../src/rootmenu.c:886 ../src/rootmenu.c:896
+#: ../src/rootmenu.c:876 ../src/rootmenu.c:894 ../src/rootmenu.c:904
#, c-format
msgid "%s:missing parameter for menu command \"%s\""
msgstr "%s: fehlender Parameter für Menübefehl \"%s\""
-#: ../src/rootmenu.c:964
+#: ../src/rootmenu.c:972
#, c-format
msgid "%s:unknown command \"%s\" in menu config."
msgstr "%s: unbekannter Befehl \"%s\" in Menükonfiguration"
-#: ../src/rootmenu.c:972
+#: ../src/rootmenu.c:980
#, c-format
msgid "%s:can't add shortcut for entry \"%s\""
msgstr "%s: Tastaturkürzel für Eintrag \"%s\" kann nicht hinzugefügt werden"
-#: ../src/rootmenu.c:1109
+#: ../src/rootmenu.c:1117
#, c-format
msgid "%s:maximal line size exceeded in menu config: %s"
msgstr "%s: überlange Zeilen in Menükonfiguration: %s"
-#: ../src/rootmenu.c:1131 ../src/rootmenu.c:1224 ../src/rootmenu.c:1326
+#: ../src/rootmenu.c:1139 ../src/rootmenu.c:1232 ../src/rootmenu.c:1336
#, c-format
msgid "%s:missing command in menu config: %s"
msgstr "%s: fehlender Befehl in Menükonfiguration: %s"
-#: ../src/rootmenu.c:1161
+#: ../src/rootmenu.c:1169
#, c-format
msgid "%s:syntax error in menu file:END declaration missing"
msgstr "%s: Syntaxfehler in Menüdatei: END-Schlüsselwort fehlt."
-#: ../src/rootmenu.c:1190 ../src/rootmenu.c:1290
+#: ../src/rootmenu.c:1198 ../src/rootmenu.c:1300
msgid "could not make arguments for menu file preprocessor"
msgstr "Argumente für Menüdatei-Präprozessort konnten nicht gesetzt werden"
-#: ../src/rootmenu.c:1197 ../src/rootmenu.c:1298
+#: ../src/rootmenu.c:1205 ../src/rootmenu.c:1308
#, c-format
msgid "%s:could not open/preprocess menu file"
msgstr "%s: Menüdatei konnte nicht geöffnet/bearbeitet werden"
-#: ../src/rootmenu.c:1209 ../src/rootmenu.c:1311
+#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321
#, c-format
msgid "%s:could not open menu file"
msgstr "%s: Menüdatei konnte nicht geöffnet werden"
-#: ../src/rootmenu.c:1236
+#: ../src/rootmenu.c:1244
#, c-format
msgid "%s:invalid menu file. MENU command is missing"
msgstr "%s: ungültige Menüdatei: MENU-Befehl fehlt"
-#: ../src/rootmenu.c:1245
+#: ../src/rootmenu.c:1253
msgid "error reading preprocessed menu data"
msgstr "Fehler beim Lesen der aufbereiteten Menüdaten"
-#: ../src/rootmenu.c:1338
+#: ../src/rootmenu.c:1348
#, c-format
msgid "%s:no title given for the root menu"
msgstr "%s: kein Titel für das Stammenü"
-#: ../src/rootmenu.c:1429 ../src/rootmenu.c:1502 ../src/rootmenu.c:1543
+#: ../src/rootmenu.c:1439 ../src/rootmenu.c:1512 ../src/rootmenu.c:1553
#, c-format
msgid "out of memory while constructing directory menu %s"
msgstr "zuwenig Speicher beim Erstellen des Verzeichnismenüs %s"
-#: ../src/rootmenu.c:1439
+#: ../src/rootmenu.c:1449
#, c-format
msgid "%s:could not stat file \"%s\" in menu directory"
msgstr "%s: Datei \"%s\" in Menü-Verzeichnis konnte nicht erstellt werden"
-#: ../src/rootmenu.c:1597
+#: ../src/rootmenu.c:1607
msgid "Commands"
msgstr "Befehle"
-#: ../src/rootmenu.c:1600
+#: ../src/rootmenu.c:1610
msgid "Restart"
msgstr "Neustart"
-#: ../src/rootmenu.c:1601
+#: ../src/rootmenu.c:1611
msgid "Exit..."
msgstr "Beenden..."
-#: ../src/rootmenu.c:1646
+#: ../src/rootmenu.c:1656
#, c-format
msgid "could not find menu file \"%s\" referenced in WMRootMenu"
-msgstr "Menüdate \"%s\" aus WMRootMenu konnte nicht gefunden werden"
+msgstr "Menüdatei \"%s\" aus WMRootMenu konnte nicht gefunden werden"
-#: ../src/rootmenu.c:1653
+#: ../src/rootmenu.c:1663
#, c-format
msgid "could not access menu \"%s\" referenced in WMRootMenu"
-msgstr "auf Menüdate \"%s\" aus WMRootMenu konnte nicht zugegriffen werden"
+msgstr "auf Menüdatei \"%s\" aus WMRootMenu konnte nicht zugegriffen werden"
-#: ../src/rootmenu.c:1664
+#: ../src/rootmenu.c:1674
#, c-format
msgid ""
"using default menu file \"%s\" as the menu referenced in WMRootMenu could "
"not be found "
msgstr "Standard-Menüdatei \"%s\" aus WMRootMenu konnte nicht gefunden werden "
-#: ../src/rootmenu.c:1687 ../src/rootmenu.c:1763
+#: ../src/rootmenu.c:1697 ../src/rootmenu.c:1773
#, c-format
msgid "%s:format error in root menu configuration \"%s\""
msgstr "%s: Formatierungsfehler in Stammenü-Konfiguration \"%s\""
-#: ../src/rootmenu.c:1851
+#: ../src/rootmenu.c:1855
msgid ""
"The applications menu could not be loaded. Look at the console output for a "
"detailed description of the errors."
-msgstr "Das Anwendungsmenü konnte nicht geladen werden. Für detaillierte Fehlerbeschreibungen bitte die Konsolenausgabe ansehen."
+msgstr ""
+"Das Anwendungsmenü konnte nicht geladen werden. Für detaillierte "
+"Fehlerbeschreibungen bitte die Konsolenausgabe ansehen."
-#: ../src/screen.c:740
+#: ../src/screen.c:709
#, c-format
msgid "could not initialize graphics library context: %s"
msgstr "Kontext der Grafikbibliothek konnte nicht initialisiert werden: %s"
-#: ../src/screen.c:771
-msgid "could not do initialization of WINGs widget set"
-msgstr "WINGs Widgets konnten nicht initialisiert werden"
+#: ../src/screen.c:737
+msgid "could not initialize WINGs widget set"
+msgstr "WINGs-Widgets konnten nicht initialisiert werden"
-#: ../src/screen.c:1139
+#: ../src/screen.c:1144
#, c-format
msgid "could not save session state in %s"
msgstr "Sitzung konnte nicht in %s gespeichert werden"
-#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:454
+#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:459
#, c-format
msgid "can't convert \"%s\" to boolean"
-msgstr "\"%s\" konnte nicht in Wahrheitswert konvertiert werden"
+msgstr "\"%s\" konnte nicht in Boolean konvertiert werden"
-#: ../src/session.c:1021
+#: ../src/session.c:1018
msgid "out of memory while saving session state"
msgstr "zuwenig Speicher beim Sichern der Sitzung"
-#: ../src/session.c:1104
+#: ../src/session.c:1101
msgid "end of memory while saving session state"
msgstr "zuwenig Speicher beim Sichern der Sitzung"
@@ -1318,107 +1319,42 @@
#. * If the sm was the last client of session, then we'll die
#. * anyway, otherwise we can continue doing our stuff.
#.
-#: ../src/session.c:1242
+#: ../src/session.c:1239
msgid "connection to the session manager was lost"
msgstr "Verbindung zum Sitzungsmanager verloren"
-#: ../src/stacking.c:79
+#: ../src/stacking.c:81
msgid "could not get window list!!"
msgstr "Konnte Fensterliste nicht erstellen!"
-#: ../src/startup.c:202
+#: ../src/startup.c:195
#, c-format
msgid "internal X error: %s\n"
msgstr "interner X-Fehler %s\n"
-#: ../src/startup.c:260
-#, c-format
-msgid "got signal %i (%s) - restarting\n"
-msgstr "Signal %i (%s) erhalten - starte neu...\n"
-
-#: ../src/startup.c:262
-#, c-format
-msgid "got signal %i - restarting\n"
-msgstr "Signal %i erhalten - starte neu...\n"
-
-#: ../src/startup.c:272
-#, c-format
-msgid "got signal %i (%s) - rereading defaults\n"
-msgstr "Signal %i (%s) erhalten - Standard werden neu eingelesen\n"
-
-#: ../src/startup.c:274
-#, c-format
-msgid "got signal %i - rereading defaults\n"
-msgstr "Signal %i erhalten - Standard werden neu eingelesen\n"
-
-#: ../src/startup.c:284
-#, c-format
-msgid "got signal %i (%s) - exiting...\n"
-msgstr "Signal %i (%s) erhalten - beende...\n"
-
-#: ../src/startup.c:286
-#, c-format
-msgid "got signal %i - exiting...\n"
-msgstr "Signal %i erhalten - beende...\n"
-
-#: ../src/startup.c:329
-#, c-format
-msgid "got signal %i (%s)\n"
-msgstr "Signal %i (%s) erhalten\n"
-
-#: ../src/startup.c:331
-#, c-format
-msgid "got signal %i\n"
-msgstr "Signal %i erhalten\n"
-
-#: ../src/startup.c:342
-msgid "crashed while trying to do some post-crash cleanup. Aborting immediatelly."
-msgstr "Beim Aufräumen nach einem Fehler trat ein weiterer Fehler auf. Programm wird sofort angebrochen."
-
-#. we try to restart Window Maker
-#: ../src/startup.c:407
-msgid "trying to restart Window Maker..."
-msgstr "versuche, Window Maker neu zu starten..."
-
-#: ../src/startup.c:412
-msgid "trying to start alternate window manager..."
-msgstr "versuche, anderen Windowmanager zu starten..."
-
-#: ../src/startup.c:417
-msgid "failed to start alternate window manager. Aborting."
-msgstr "Start eines anderen Windowmanagers schlug fehl. Breche ab."
-
-#: ../src/startup.c:419
-msgid ""
-"a fatal error has occured, probably due to a bug. Please fill the included "
-"BUGFORM and report it."
-msgstr ""
-"Ein fataler Fehler ist möglicherweise aufgrund eines Programmfehlers aufgetreten. Bitte füllen Sie die "
-"mitgelieferte BUGFORM aus und schicken sie an bugs@windowmaker.org"
-
-#: ../src/startup.c:894
+#: ../src/startup.c:772
#, c-format
msgid "icon size is configured to %i, but it's too small. Using 16, instead\n"
-msgstr "Symbolgröße ist eingestellt auf %i, aber zu klein. Neue Größe ist 16\n"
+msgstr "Symbolgröße ist eingestellt auf %i, dieser Wert ist zu klein. Neue Größe ist 16\n"
-#: ../src/startup.c:922
+#: ../src/startup.c:801
msgid "XKB is not supported. KbdModeLock is automatically disabled."
msgstr "XKB wird nicht unterstützt. KbdModeLock wird ausgeschaltet"
-#: ../src/startup.c:941
+#: ../src/startup.c:820
msgid "it seems that there is already a window manager running"
-msgstr "Läuft da nicht schon ein anderer Windowmanager;-)?"
+msgstr "Es sieht aus, als ob schon ein anderer Windowmanager liefe."
-#: ../src/startup.c:947
+#: ../src/startup.c:826
#, c-format
msgid "could not manage screen %i"
msgstr "Konnte Bildschirm %i nicht ansprechen"
-#: ../src/startup.c:1015
+#: ../src/startup.c:885
msgid "could not manage any screen"
msgstr "kein Bildschirm konnte angesprochen werden"
-#: ../src/switchmenu.c:137
+#: ../src/switchmenu.c:145
msgid "Windows"
msgstr "Fenster"
@@ -1448,20 +1384,21 @@
#: ../src/texture.c:598
msgid "could not allocate image buffer"
-msgstr "Bildpuffer konnte nicht allokiert werden"
+msgstr "Bildpuffer konnte nicht erstellt werden"
#: ../src/wdefaults.c:437
#, c-format
msgid "could not find icon file \"%s\""
msgstr "Symboldatei \"%s\" konnte nicht gefunden werden"
-#: ../src/window.c:2936 ../src/window.c:3075
+#: ../src/window.c:3052 ../src/window.c:3193
msgid ""
"the NumLock, ScrollLock or similar key seems to be turned on.\n"
"Turn it off or some mouse actions and keyboard shortcuts will not work."
msgstr ""
"Es scheint, dass NumLock, ScrollLock oder ähnliche Tasten aktiviert sind.\n"
-"Schalten Sie diese aus, da sonst einige Mausaktionen oder Tastaturkürzel nicht funktionieren."
+"Schalten Sie diese aus, da sonst einige Mausaktionen oder Tastaturkürzel "
+"nicht funktionieren."
#: ../src/winmenu.c:125
msgid ""
@@ -1473,30 +1410,39 @@
"dabei gehen alle ungespeicherten Daten verloren.\n"
"Bitte bestätigen."
-#: ../src/winmenu.c:267 ../src/winmenu.c:276
+#: ../src/winmenu.c:268 ../src/winmenu.c:277
msgid "Set Shortcut"
msgstr "Setze Kürzel"
-#: ../src/winmenu.c:354 ../src/winmenu.c:399
+#: ../src/winmenu.c:355 ../src/winmenu.c:400
msgid "could not create submenu for window menu"
msgstr "Untermenü für Fenstermenü konnte nicht erstellt werden"
-#: ../src/winmenu.c:403
+#: ../src/winmenu.c:404
msgid "Keep on top"
msgstr "Immer oben"
-#: ../src/winmenu.c:408
+#: ../src/winmenu.c:409
msgid "Keep at bottom"
msgstr "Immer unten"
+#.
+#. * Warning: If you make some change that affects the order of the
+#. * entries, you must update the command #defines in the top of
+#. * this file.
+#.
+#: ../src/winmenu.c:437 ../src/winmenu.c:571
+msgid "Maximize"
+msgstr "Maximieren"
+
+#: ../src/winmenu.c:445 ../src/winmenu.c:557
+msgid "Miniaturize"
+msgstr "Minimieren"
+
#: ../src/winmenu.c:453 ../src/winmenu.c:588
msgid "Shade"
msgstr "Aufrollen"
-#: ../src/winmenu.c:473
-msgid "Hide Others"
-msgstr "Andere Verstecken"
-
#: ../src/winmenu.c:469
msgid "Resize/Move"
msgstr "Größe/ Position ändern"
@@ -1505,6 +1451,10 @@
msgid "Select"
msgstr "Auswählen"
+#: ../src/winmenu.c:485
+msgid "Move To"
+msgstr "Bewegen nach..."
+
#: ../src/winmenu.c:490
msgid "Attributes..."
msgstr "Eigenschaften"
@@ -1513,30 +1463,38 @@
msgid "Options"
msgstr "Optionen"
+#: ../src/winmenu.c:552
+msgid "Deminiaturize"
+msgstr "Wiederherstellen"
+
+#: ../src/winmenu.c:566
+msgid "Unmaximize"
+msgstr "Ursprüngliche Größe"
+
#: ../src/winmenu.c:583
msgid "Unshade"
msgstr "Abrollen"
-#: ../src/winspector.c:387
+#: ../src/winspector.c:392
#, c-format
msgid "Could not find icon \"%s\" specified for this window"
msgstr "Symbol \"%s\" für dieses Fenster konnte nicht gefunden werden"
-#: ../src/winspector.c:404
+#: ../src/winspector.c:409
#, c-format
msgid "Could not open specified icon \"%s\":%s"
msgstr "Symbol \"%s\" konnte nicht geöffnet werden: %s"
-#: ../src/winspector.c:1121
+#: ../src/winspector.c:1129
#, c-format
msgid "Inspecting %s.%s"
msgstr "Untersuchen von %s.%s"
-#: ../src/winspector.c:1147
+#: ../src/winspector.c:1155
msgid "Click in the window you wish to inspect."
msgstr "Klicken Sie auf das Fenster, das untersucht werden soll."
-#: ../src/winspector.c:1186
+#: ../src/winspector.c:1194
msgid ""
"The configuration will apply to all\n"
"windows that have their WM_CLASS\n"
@@ -1546,57 +1504,57 @@
"Beim Speichern wirkt sich diese\n"
"Konfiguration auf alle Fenster aus,\n"
"deren WM_CLASS-Eigenschaft den\n"
-"obigen Namen hat."
+"obigen Wert hat."
-#: ../src/winspector.c:1215
+#: ../src/winspector.c:1223
msgid "Save"
msgstr "Speichern"
-#: ../src/winspector.c:1223
+#: ../src/winspector.c:1231
msgid "Apply"
msgstr "Anwenden"
-#: ../src/winspector.c:1229
+#: ../src/winspector.c:1237
msgid "Reload"
msgstr "Neu laden"
-#: ../src/winspector.c:1238 ../src/winspector.c:1248
+#: ../src/winspector.c:1246 ../src/winspector.c:1256
msgid "Window Specification"
msgstr "Fensterbeschreibung"
-#: ../src/winspector.c:1239
+#: ../src/winspector.c:1247
msgid "Window Attributes"
msgstr "Fenstereigenschaften"
-#: ../src/winspector.c:1240
+#: ../src/winspector.c:1248
msgid "Advanced Options"
msgstr "Erweiterte Optionen"
-#: ../src/winspector.c:1241
+#: ../src/winspector.c:1249
msgid "Icon and Initial Workspace"
msgstr "Symbol und Start-Arbeitsfläche"
-#: ../src/winspector.c:1242
+#: ../src/winspector.c:1250
msgid "Application Specific"
msgstr "Anwendungsspezifisches"
-#: ../src/winspector.c:1256
+#: ../src/winspector.c:1264
msgid "Defaults for all windows"
msgstr "Standards für alle Fenster"
-#: ../src/winspector.c:1310
+#: ../src/winspector.c:1318
msgid "Select window"
msgstr "Fenster auswählen"
-#: ../src/winspector.c:1324
+#: ../src/winspector.c:1332
msgid "Attributes"
msgstr "Eigenschaften"
-#: ../src/winspector.c:1335
+#: ../src/winspector.c:1343
msgid "Disable titlebar"
msgstr "Keine Titelleiste"
-#: ../src/winspector.c:1337
+#: ../src/winspector.c:1345
msgid ""
"Remove the titlebar of this window.\n"
"To access the window commands menu of a window\n"
@@ -1608,43 +1566,43 @@
"Für das Fenstermenü drücken Sie bitte Strg+Esc\n"
"bzw. die von Ihnen eingestellte Tastenkombination."
-#: ../src/winspector.c:1344
+#: ../src/winspector.c:1352
msgid "Disable resizebar"
-msgstr "Keine Leiste zum Ändern der Größe"
+msgstr "Keine Leiste für Größenänderung"
-#: ../src/winspector.c:1346
+#: ../src/winspector.c:1354
msgid "Remove the resizebar of this window."
msgstr "Entfernen der Leiste zum Ändern der Größe bei diesem Fenster."
-#: ../src/winspector.c:1349
+#: ../src/winspector.c:1357
msgid "Disable close button"
msgstr "Keine Schließen-Schaltfläche"
-#: ../src/winspector.c:1351
+#: ../src/winspector.c:1359
msgid "Remove the `close window' button of this window."
msgstr "Entfernen der 'Fenster schließen'-Schaltfläche für dieses Fensters"
-#: ../src/winspector.c:1354
+#: ../src/winspector.c:1362
msgid "Disable miniaturize button"
msgstr "Keine Minimieren-Schaltfläche"
-#: ../src/winspector.c:1356
+#: ../src/winspector.c:1364
msgid "Remove the `miniaturize window' button of the window."
msgstr "Entfernen der 'Fenster minimieren'-Schaltfläche für dieses Fenster"
-#: ../src/winspector.c:1359
+#: ../src/winspector.c:1367
msgid "Disable border"
msgstr "Kein Rand"
-#: ../src/winspector.c:1361
+#: ../src/winspector.c:1369
msgid "Remove the 1 pixel black border around the window."
-msgstr "Entfernen des ein Pixel breiten schwarzen Randes um das Fenster."
+msgstr "Entfernen des einen Pixel breiten schwarzen Randes um das Fenster."
-#: ../src/winspector.c:1364
+#: ../src/winspector.c:1372
msgid "Keep on top (floating)"
msgstr "Immer oben"
-#: ../src/winspector.c:1366
+#: ../src/winspector.c:1374
msgid ""
"Keep the window over other windows, not allowing\n"
"them to cover it."
@@ -1652,43 +1610,43 @@
"Dieses Fenster immer oben halten, sodass es nicht\n"
"von anderen Fenstern verdeckt wird"
-#: ../src/winspector.c:1370
+#: ../src/winspector.c:1378
msgid "Keep at bottom (sunken)"
msgstr "Immer unten"
-#: ../src/winspector.c:1372
+#: ../src/winspector.c:1380
msgid "Keep the window under all other windows."
msgstr "Dieses Fenster unter allen anderen Fenster platzieren"
-#: ../src/winspector.c:1377
+#: ../src/winspector.c:1385
msgid "Make window present in all workspaces."
msgstr "Dieses Fenster auf allen Arbeitsflächen sichtbar machen"
-#: ../src/winspector.c:1380
+#: ../src/winspector.c:1388
msgid "Start miniaturized"
msgstr "Minimiert starten"
-#: ../src/winspector.c:1382
+#: ../src/winspector.c:1390
msgid ""
"Make the window be automatically miniaturized when it's\n"
"first shown."
msgstr "Dieses Fenster beim Start automatisch minimieren"
-#: ../src/winspector.c:1386
+#: ../src/winspector.c:1394
msgid "Start maximized"
msgstr "Maximiert starten"
-#: ../src/winspector.c:1388
+#: ../src/winspector.c:1396
msgid ""
"Make the window be automatically maximized when it's\n"
"first shown."
-msgstr "Dieses Fenster wird beim Start automatisch maximiert"
+msgstr "Dieses Fenster beim Start automatisch maximieren"
-#: ../src/winspector.c:1392
+#: ../src/winspector.c:1400
msgid "Full screen maximization"
msgstr "Vollbild-Maximierung"
-#: ../src/winspector.c:1394
+#: ../src/winspector.c:1402
msgid ""
"Make the window use the whole screen space when it's\n"
"maximized. The titlebar and resizebar will be moved\n"
@@ -1698,15 +1656,15 @@
"ausdehnen, Titel- und Größenleiste befinden sich dann außerhalb\n"
"des Bildschirms."
-#: ../src/winspector.c:1411
+#: ../src/winspector.c:1419
msgid "Advanced"
msgstr "Erweitert"
-#: ../src/winspector.c:1428
+#: ../src/winspector.c:1436
msgid "Do not bind keyboard shortcuts"
msgstr "Keine Tastatur-Kürzel abfangen"
-#: ../src/winspector.c:1430
+#: ../src/winspector.c:1438
msgid ""
"Do not bind keyboard shortcuts from Window Maker\n"
"when this window is focused. This will allow the\n"
@@ -1714,14 +1672,14 @@
"of your shortcut configuration."
msgstr ""
"Keine globalen Window Maker-Tastaturkürzel abfangen,\n"
-"wenn dieses Fenster maximiert ist. Dadurch erhalt dieses\n"
+"wenn dieses Fenster maximiert ist. Dadurch erhält dieses\n"
"Fenster alle Tastendrücke."
-#: ../src/winspector.c:1436
+#: ../src/winspector.c:1444
msgid "Do not bind mouse clicks"
msgstr "Kein Mausklicks abfangen"
-#: ../src/winspector.c:1438
+#: ../src/winspector.c:1446
msgid ""
"Do not bind mouse actions, such as `Alt'+drag\n"
"in the window (when alt is the modifier you haveconfigured)."
@@ -1729,29 +1687,29 @@
"Für dieses Fenster keine Mausaktionen abfangen,\n"
"zum Beispiel Alt+Ziehen."
-#: ../src/winspector.c:1443
+#: ../src/winspector.c:1451
msgid "Do not show in the window list"
msgstr "Nicht in der Fensterliste zeigen"
-#: ../src/winspector.c:1445
+#: ../src/winspector.c:1453
msgid "Do not list the window in the window list menu."
msgstr "Dieses Fenster nicht in der Fensterliste aufführen."
-#: ../src/winspector.c:1448
+#: ../src/winspector.c:1456
msgid "Do not let it take focus"
msgstr "Keinen Fokus erlauben"
-#: ../src/winspector.c:1450
+#: ../src/winspector.c:1458
msgid ""
"Do not let the window take keyboard focus when you\n"
"click on it."
msgstr "Diesem Fenster beim Klick nicht den Tastaturfokus geben."
-#: ../src/winspector.c:1454
+#: ../src/winspector.c:1462
msgid "Keep inside screen"
msgstr "Immer innerhalb des Bildschirmes"
-#: ../src/winspector.c:1456
+#: ../src/winspector.c:1464
msgid ""
"Do not allow the window to move itself completely\n"
"outside the screen. For bug compatibility.\n"
@@ -1759,21 +1717,21 @@
"Diesem Fenster nicht erlauben, ganz aus dem Bildschirm\n"
"bewegt zu werden.\n"
-#: ../src/winspector.c:1460
+#: ../src/winspector.c:1468
msgid "Ignore 'Hide Others'"
-msgstr "Ignoriere 'Andere Verstecken'"
+msgstr "Ignoriere 'Andere verstecken'"
-#: ../src/winspector.c:1462
+#: ../src/winspector.c:1470
msgid ""
"Do not hide the window when issuing the\n"
"`HideOthers' command."
-msgstr "Beim AndereVerstecken-Befehl dieses Fenster auslassen."
+msgstr "Beim 'Andere verstecken'-Befehl dieses Fenster auslassen."
-#: ../src/winspector.c:1466
+#: ../src/winspector.c:1474
msgid "Ignore 'Save Session'"
msgstr "'Sitzung speichern' ignorieren"
-#: ../src/winspector.c:1468
+#: ../src/winspector.c:1476
msgid ""
"Do not save the associated application in the\n"
"session's state, so that it won't be restarted\n"
@@ -1784,11 +1742,11 @@
"im Sitzungszustand speichern, sodass sie beim\n"
"Start von Window Maker nicht gestartet wird."
-#: ../src/winspector.c:1474
+#: ../src/winspector.c:1482
msgid "Emulate application icon"
msgstr "Anwendungssymbol ignorieren"
-#: ../src/winspector.c:1476
+#: ../src/winspector.c:1484
msgid ""
"Make this window act as an application that provides\n"
"enough information to Window Maker for a dockable\n"
@@ -1798,55 +1756,55 @@
"es genügend Informationen für eine dockbare\n"
"Anwendung an Window Maker liefern würde."
-#: ../src/winspector.c:1482
+#: ../src/winspector.c:1490
msgid "Disable language button"
msgstr "Keine Sprachen-Schaltfläche"
-#: ../src/winspector.c:1484
+#: ../src/winspector.c:1492
msgid "Remove the `toggle language' button of the window."
msgstr "Entfern der 'Wechsle Sprache'-Schaltfläche bei diesem Fenster"
-#: ../src/winspector.c:1501
+#: ../src/winspector.c:1509
msgid "Miniwindow Image"
msgstr "Minifenster-Bild"
-#: ../src/winspector.c:1528
+#: ../src/winspector.c:1536
msgid "Icon filename:"
msgstr "Symboldateiname"
-#: ../src/winspector.c:1541
+#: ../src/winspector.c:1549
msgid "Ignore client supplied icon"
msgstr "Ignoriere zur Verfügung gestelltes Symbol"
-#: ../src/winspector.c:1548
+#: ../src/winspector.c:1556
msgid "Initial Workspace"
msgstr "Start-Arbeitsfläche"
-#: ../src/winspector.c:1550
+#: ../src/winspector.c:1558
msgid "The workspace to place the window when it'sfirst shown."
msgstr "Die Arbeitsfläche, auf dem das Fenster beim Start erscheinen soll"
-#: ../src/winspector.c:1556
+#: ../src/winspector.c:1564
msgid "Nowhere in particular"
-msgstr "Ist mir eigentlich egal"
+msgstr "Keine Angabe"
-#: ../src/winspector.c:1574
+#: ../src/winspector.c:1582
msgid "Application Attributes"
msgstr "Anwendungseigenschaften"
-#: ../src/winspector.c:1585
+#: ../src/winspector.c:1593
msgid "Start hidden"
msgstr "Versteckt starten"
-#: ../src/winspector.c:1587
+#: ../src/winspector.c:1595
msgid "Automatically hide application when it's started."
msgstr "Anwendung beim Start automatisch verstecken"
-#: ../src/winspector.c:1590
+#: ../src/winspector.c:1598
msgid "No application icon"
msgstr "Kein Anwendungssymbol"
-#: ../src/winspector.c:1592
+#: ../src/winspector.c:1600
msgid ""
"Disable the application icon for the application.\n"
"Note that you won't be able to dock it anymore,\n"
@@ -1858,36 +1816,36 @@
"docken lässt und bereits gedockte Symbole nicht mehr korrekt\n"
"arbeiten."
-#: ../src/winspector.c:1598
+#: ../src/winspector.c:1606
msgid "Shared application icon"
msgstr "Geteiltes Anwendungssymbol"
-#: ../src/winspector.c:1600
+#: ../src/winspector.c:1608
msgid ""
"Use a single shared application icon for all of\n"
"the instances of this application.\n"
msgstr ""
"Für alle Instanzen dieser Anwendung ein\n"
-"einziges Symbol verwenden.\n"
+"einziges Anwendungssymbol verwenden.\n"
-#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:876
+#: ../src/workspace.c:103 ../src/workspace.c:104 ../src/workspace.c:1302
#, c-format
msgid "Workspace %i"
msgstr "Arbeitsfläche: %i"
-#: ../src/workspace.c:926
+#: ../src/workspace.c:1352
msgid "Workspaces"
msgstr "Arbeitsflächen"
-#: ../src/workspace.c:928
+#: ../src/workspace.c:1354
msgid "could not create Workspace menu"
msgstr "Arbeitsflächenmenü konnte nicht erstellt werden"
-#: ../src/workspace.c:935
+#: ../src/workspace.c:1361
msgid "New"
msgstr "Neu"
-#: ../src/workspace.c:936
+#: ../src/workspace.c:1362
msgid "Destroy Last"
-msgstr "Letztes zerstören"
+msgstr "Letzten zerstören"
diff -uhrN WindowMaker-0.92.0/po/et.po WindowMaker-CVS-20060123/po/et.po
--- WindowMaker-0.92.0/po/et.po 2004-10-26 05:52:38.000000000 +0200
+++ WindowMaker-CVS-20060123/po/et.po 2006-01-22 20:07:15.000000000 +0100
@@ -1,10 +1,14 @@
-# Estonian translation of Window Maker
-# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-# Ivar Smolin <okul@linux.ee>, 2000, 2001
+# Window Maker'i eesti keele tõlge.
+# Estonian translation of Window Maker.
+#
+# Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc.
+# Ivar Smolin <okul@linux.ee>, 2000, 2001, 2005
+#
msgid ""
msgstr ""
-"Project-Id-Version: Window Maker 0.70.0\n"
-"POT-Creation-Date: 2001-12-17 23:29+0200\n"
+"Project-Id-Version: Window Maker 0.92.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-11 23:45+0300\n"
"PO-Revision-Date: 2001-12-17 23:30+0200\n"
"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -12,25 +16,25 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325
-#: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1850
-#: ../src/winspector.c:389 ../src/winspector.c:406
+#: ../src/appicon.c:415 ../src/dialog.c:295 ../src/dock.c:3335
+#: ../src/dockedapp.c:231 ../src/main.c:271 ../src/rootmenu.c:1854
+#: ../src/winspector.c:394 ../src/winspector.c:411
msgid "Error"
msgstr "Viga"
-#: ../src/appicon.c:427
+#: ../src/appicon.c:416
msgid "Could not open specified icon file"
-msgstr "Ei õnnestu avada kirjeldatud ikoonifaili"
+msgstr "Kirjeldatud ikoonifaili pole võimalik avada"
-#: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282
-#: ../src/dialog.c:729 ../src/dialog.c:1792 ../src/dock.c:526
-#: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326
-#: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273
-#: ../src/rootmenu.c:1854 ../src/winspector.c:390 ../src/winspector.c:407
+#: ../src/appicon.c:417 ../src/dialog.c:192 ../src/dialog.c:295
+#: ../src/dialog.c:725 ../src/dialog.c:1797 ../src/dock.c:515
+#: ../src/dock.c:523 ../src/dock.c:547 ../src/dock.c:3336
+#: ../src/dockedapp.c:232 ../src/dockedapp.c:427 ../src/main.c:271
+#: ../src/rootmenu.c:1858 ../src/winspector.c:395 ../src/winspector.c:412
msgid "OK"
-msgstr "OK"
+msgstr "Olgu"
-#: ../src/appicon.c:456 ../src/dock.c:264
+#: ../src/appicon.c:445 ../src/dock.c:244
msgid ""
" will be forcibly closed.\n"
"Any unsaved changes will be lost.\n"
@@ -38,344 +42,377 @@
msgstr ""
" suletakse jõuga.\n"
"Kõik salvestamata andmed lähevad kaotsi.\n"
-"Kas soovite seda teha?"
+"Kas soovid seda teha?"
-#: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:124
+#: ../src/appicon.c:453 ../src/dock.c:263 ../src/winmenu.c:124
msgid "Kill Application"
msgstr "Programmi kõrvaldamine"
-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
msgid "Yes"
msgstr "Jah"
-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
msgid "No"
msgstr "Ei"
-#: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491
+#: ../src/appicon.c:484 ../src/dock.c:1168 ../src/dock.c:3501
msgid "Unhide Here"
msgstr "Too siia töölauale"
-#: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179
-#: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:461
+#: ../src/appicon.c:485 ../src/appicon.c:510 ../src/dock.c:1170
+#: ../src/dock.c:1172 ../src/dock.c:3513 ../src/winmenu.c:461
msgid "Hide"
msgstr "Peida"
-#: ../src/appicon.c:497
+#: ../src/appicon.c:486
msgid "Set Icon..."
-msgstr "Vali ikoon..."
+msgstr "Ikooni määramine..."
-#: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248
+#: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248
#: ../src/rootmenu.c:264 ../src/winmenu.c:508
msgid "Kill"
msgstr "Kõrvalda"
-#: ../src/appicon.c:519 ../src/dock.c:3501
+#: ../src/appicon.c:508 ../src/dock.c:3511
msgid "Unhide"
msgstr "Too nähtavale"
-#: ../src/application.c:397
+#: ../src/application.c:405
#, c-format
msgid "recreating missing icon '%s'"
-msgstr "loon uuesti puuduva ikooni '%s'"
+msgstr "puuduva ikooni '%s' uuestiloomine"
-#: ../src/defaults.c:923 ../src/startup.c:885 ../src/startup.c:903
-#: ../src/startup.c:909
+#: ../src/defaults.c:930 ../src/defaults.c:1148
+#, c-format
+msgid "Domain %s (%s) of global defaults database is corrupted!"
+msgstr "Üldiste vaikeväärtuste andmebaasi domeen %s (%s) on rikutud!"
+
+#: ../src/defaults.c:935
+#, c-format
+msgid "could not load domain %s from global defaults database"
+msgstr ""
+"domeeni %s pole võimalik globaalsete vaikeväärtuste andmebaasist laadida"
+
+#: ../src/defaults.c:1034 ../src/defaults.c:1049
+#, c-format
+msgid "invalid global menu file %s"
+msgstr "vigane globaalmenüü fail %s"
+
+#: ../src/defaults.c:1077 ../src/startup.c:761 ../src/startup.c:779
+#: ../src/startup.c:786
#, c-format
msgid "could not read domain \"%s\" from defaults database"
-msgstr "ei õnnestu lugeda domeeni \"%s\" vaikeväärtuste andmebaasist"
+msgstr "domeeni \"%s\" pole võimalik vaikeväärtuste andmebaasist lugeda"
-#: ../src/defaults.c:969 ../src/defaults.c:1086 ../src/defaults.c:1124
-#: ../src/defaults.c:1170
+#: ../src/defaults.c:1123 ../src/defaults.c:1237 ../src/defaults.c:1278
+#: ../src/defaults.c:1334
#, c-format
msgid "Domain %s (%s) of defaults database is corrupted!"
-msgstr "Domeen %s (%s) vaikeväärtuste andmebaasis on katki!"
+msgstr "Vaikeväärtuste andmebaasi domeen %s (%s) on rikutud!"
-#: ../src/defaults.c:974 ../src/defaults.c:1106 ../src/defaults.c:1153
-#: ../src/defaults.c:1179 ../src/menureader.c:397
+#: ../src/defaults.c:1137 ../src/defaults.c:1257 ../src/defaults.c:1314
+#: ../src/defaults.c:1344
#, c-format
msgid "could not load domain %s from user defaults database"
-msgstr "ei õnnestu lugeda domeeni %s kasutaja vaikeväärtuste andmebaasist"
+msgstr "domeeni %s pole võimalik kasutaja vaikeväärtuste andmebaasist lugeda"
-#: ../src/defaults.c:985 ../src/defaults.c:1071
-#, c-format
-msgid "Domain %s (%s) of global defaults database is corrupted!"
-msgstr "Üldise vaikeväärtuste andmebaasi domeen %s (%s) on katki!"
-
-#: ../src/defaults.c:1004
+#: ../src/defaults.c:1167
#, c-format
msgid "could not load domain %s from global defaults database (%s)"
msgstr ""
-"ei õnnestu laadida domeeni %s üldisest vaikeväärtuste andmebaasist (%s)"
-
-#: ../src/defaults.c:1076
-#, c-format
-msgid "could not load domain %s from global defaults database"
-msgstr "ei õnnestu laadida domeeni %s globaalsete vaikeväärtuste andmebaasist"
+"domeeni %s pole võimalik üldisest vaikeväärtuste andmebaasist (%s) laadida"
-#: ../src/defaults.c:1143 ../src/screen.c:458
+#: ../src/defaults.c:1304 ../src/screen.c:419
#, c-format
msgid "could not load logo image for panels: %s"
-msgstr "ei õnnestu laadida paneelide logopilti: %s"
+msgstr "paneelidele pole logopilti võimalik laadida: %s"
#. --------------------------- Local -----------------------
-#: ../src/defaults.c:1388 ../src/defaults.c:1530 ../src/defaults.c:1642
-#: ../src/defaults.c:2121 ../src/defaults.c:2138 ../src/defaults.c:2183
-#: ../src/defaults.c:2230 ../src/defaults.c:2703 ../src/wdefaults.c:570
-#: ../src/wdefaults.c:606
+#: ../src/defaults.c:1553 ../src/defaults.c:1692 ../src/defaults.c:1812
+#: ../src/defaults.c:2290 ../src/defaults.c:2307 ../src/defaults.c:2352
+#: ../src/defaults.c:2399 ../src/defaults.c:2872 ../src/wdefaults.c:571
+#: ../src/wdefaults.c:604
#, c-format
msgid "Wrong option format for key \"%s\". Should be %s."
-msgstr "Vigane formaat võtmele \"%s\". Peaks olema %s."
+msgstr "Vigane vorming võtmele \"%s\". Peaks olema %s."
-#: ../src/defaults.c:1390 ../src/defaults.c:1471 ../src/defaults.c:1503
-#: ../src/defaults.c:1535 ../src/defaults.c:1548 ../src/defaults.c:1563
-#: ../src/defaults.c:1577 ../src/defaults.c:1647 ../src/defaults.c:1659
-#: ../src/defaults.c:2126 ../src/defaults.c:2143 ../src/defaults.c:2156
-#: ../src/defaults.c:2188 ../src/defaults.c:2204 ../src/defaults.c:2235
-#: ../src/defaults.c:2322 ../src/defaults.c:2708 ../src/defaults.c:2719
+#: ../src/defaults.c:1555 ../src/defaults.c:1636 ../src/defaults.c:1666
+#: ../src/defaults.c:1697 ../src/defaults.c:1710 ../src/defaults.c:1725
+#: ../src/defaults.c:1739 ../src/defaults.c:1817 ../src/defaults.c:1829
+#: ../src/defaults.c:2295 ../src/defaults.c:2312 ../src/defaults.c:2325
+#: ../src/defaults.c:2357 ../src/defaults.c:2373 ../src/defaults.c:2404
+#: ../src/defaults.c:2491 ../src/defaults.c:2877 ../src/defaults.c:2888
#, c-format
msgid "using default \"%s\" instead"
-msgstr "selle asemel kasutan vaikimisi \"%s\""
+msgstr "selle asemel kasutatakse vaikimisi \"%s\""
-#: ../src/defaults.c:1421
+#: ../src/defaults.c:1586
#, c-format
msgid "wrong option value for key \"%s\". Should be one of %s"
-msgstr "vigane valikuväärtus võtmele \"%s\". Peab olema üks %s väärtustest"
+msgstr "vigane valikuväärtus võtmele \"%s\". Peab olema üks väärtustest %s"
-#: ../src/defaults.c:1466
+#: ../src/defaults.c:1631
#, c-format
msgid "can't convert \"%s\" to boolean for key \"%s\""
-msgstr "ei õnnestu teisendada \"%s\" võtme \"%s\" loogikaväärtuseks"
+msgstr ""
+"väärtust \"%s\" pole võimalik võtme \"%s\" loogikaväärtuseks teisendada"
-#: ../src/defaults.c:1500
+#: ../src/defaults.c:1663
#, c-format
msgid "can't convert \"%s\" to integer for key \"%s\""
-msgstr "ei õnnestu teisendada \"%s\" täisarvuks võtmele \"%s\""
+msgstr ""
+"väärtust \"%s\" pole võimalik võtme \"%s\" täisarvuliseks väärtuseks "
+"teisendada"
-#: ../src/defaults.c:1543
+#: ../src/defaults.c:1705
#, c-format
msgid "Incorrect number of elements in array for key \"%s\"."
-msgstr "Ebatäpne massiivi elementide arv võtmele \"%s\"."
+msgstr "Vigane massiivi elementide arv võtmele \"%s\"."
-#: ../src/defaults.c:1558
+#: ../src/defaults.c:1720
#, c-format
msgid "Wrong value for key \"%s\". Should be Coordinate."
-msgstr "Vale võtme \"%s\" väärtus. Peaksid olemad koordinaadid."
+msgstr "Vale väärtus võtmele \"%s\". Peaks olema koordinaat."
-#: ../src/defaults.c:1573
+#: ../src/defaults.c:1735
#, c-format
msgid "can't convert array to integers for \"%s\"."
-msgstr "ei õnnestu teisendada massiivi täisarvudeks \"%s\" jaoks."
+msgstr "väärtust pole võimalik \"%s\" täisarvude massiiviks teisendada."
-#: ../src/defaults.c:1771 ../src/defaults.c:1803 ../src/defaults.c:1819
-#: ../src/defaults.c:1848 ../src/defaults.c:1871 ../src/defaults.c:1924
-#: ../src/defaults.c:1964 ../src/defaults.c:2002 ../src/defaults.c:2018
+#: ../src/defaults.c:1940 ../src/defaults.c:1972 ../src/defaults.c:1988
+#: ../src/defaults.c:2017 ../src/defaults.c:2040 ../src/defaults.c:2093
+#: ../src/defaults.c:2133 ../src/defaults.c:2171 ../src/defaults.c:2187
#, c-format
msgid "\"%s\" is not a valid color name"
-msgstr "\"%s\" ei ole korrektne värvi nimetus"
+msgstr "\"%s\" pole korrektne värvi nimetus"
-#: ../src/defaults.c:1784 ../src/defaults.c:1836
+#: ../src/defaults.c:1953 ../src/defaults.c:2005
msgid "bad number of arguments in gradient specification"
msgstr "vigane argumentide arv hajusülemineku kirjelduses"
-#: ../src/defaults.c:1897
+#: ../src/defaults.c:2066
msgid "too few arguments in multicolor gradient specification"
msgstr "liiga vähe argumente mitmevärvilise hajusülemineku kirjelduses"
-#: ../src/defaults.c:1991
+#: ../src/defaults.c:2160
msgid "bad number of arguments in textured gradient specification"
msgstr "vigane argumentide arv tekstuuriga hajusülemineku kirjelduses"
-#: ../src/defaults.c:2034
+#: ../src/defaults.c:2203
#, c-format
msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]"
msgstr ""
"vigane tumeduse väärtus tgradient tekstuurile \"%s\". Peaks olema [0..255]"
-#: ../src/defaults.c:2094
+#: ../src/defaults.c:2263
#, c-format
msgid "could not initialize library %s"
-msgstr "ei õnnestu lähtestada teeki %s"
+msgstr "teeki %s pole võimalik lähtestada"
-#: ../src/defaults.c:2097
+#: ../src/defaults.c:2266
#, c-format
msgid "could not find function %s::%s"
-msgstr "ei õnnestu leida funktsiooni %s::%s"
+msgstr "funktsiooni %s::%s pole võimalik leida"
-#: ../src/defaults.c:2104
+#: ../src/defaults.c:2273
#, c-format
msgid "invalid texture type %s"
msgstr "vigane tekstuuri tüüp %s"
-#: ../src/defaults.c:2151
+#: ../src/defaults.c:2320
#, c-format
msgid "Error in texture specification for key \"%s\""
msgstr "Viga võtme \"%s\" tekstuuri kirjelduses"
-#: ../src/defaults.c:2200
+#: ../src/defaults.c:2369
msgid "Wrong type for workspace background. Should be a texture type."
msgstr "Vigane töölaua tausta tüüp. Peaks olema tekstuur-tüüpi."
-#: ../src/defaults.c:2248
+#: ../src/defaults.c:2417
#, c-format
msgid "Wrong type for background of workspace %i. Should be a texture."
msgstr "Vigane töölaua %i tausta tüüp. Peaks olema tekstuur-tüüpi."
-#: ../src/defaults.c:2290
+#: ../src/defaults.c:2459
msgid "could not load any usable font!!!"
-msgstr "ei õnnestu laadid ühtki kasutuskõlblikku shrifti!!!"
+msgstr "ei õnnestu laadida ühtki kasutuskõlblikku kirjatüüpi!!!"
-#: ../src/defaults.c:2317
+#: ../src/defaults.c:2486
#, c-format
msgid "could not get color for key \"%s\""
-msgstr "ei õnnestu leida värvi võtmele \"%s\""
+msgstr "võtmele \"%s\" pole võimali värvi hankida"
-#: ../src/defaults.c:2375 ../src/rootmenu.c:523
+#: ../src/defaults.c:2544 ../src/rootmenu.c:531
#, c-format
-msgid "%s:invalid key modifier \"%s\""
-msgstr "%s: vigane võtme muutja \"%s\""
+msgid "%s: invalid key modifier \"%s\""
+msgstr "%s: vigane võtmemuutja \"%s\""
-#: ../src/defaults.c:2387
+#: ../src/defaults.c:2556
#, c-format
msgid "%s:invalid kbd shortcut specification \"%s\""
msgstr "%s: vigane kiirklahvi kirjeldus \"%s\""
-#: ../src/defaults.c:2394
+#: ../src/defaults.c:2563
#, c-format
msgid "%s:invalid key in shortcut \"%s\""
-msgstr "%s: vigane võti kiirklahvil \"%s\""
+msgstr "%s: vigane võti kiirklahvile \"%s\""
-#: ../src/defaults.c:2419
+#: ../src/defaults.c:2588
#, c-format
msgid "%s: modifier key %s is not valid"
-msgstr "%s: muutmisklahv %s on vigane"
+msgstr "%s: muuteklahv %s on vigane"
-#: ../src/defaults.c:2451
+#: ../src/defaults.c:2620
#, c-format
msgid "could not load image in option %s: %s"
-msgstr "ei õnnestu pildi laadimine valikus %s: %s"
+msgstr "pildi laadimine valikus %s pole võimalik: %s"
-#: ../src/defaults.c:2568
+#: ../src/defaults.c:2737
#, c-format
msgid "failed to open bitmap file \"%s\""
-msgstr "ei õnnestu avada pildifaili \"%s\""
+msgstr "pildifaili \"%s\" pole võimalik avada"
-#: ../src/defaults.c:2571
+#: ../src/defaults.c:2740
#, c-format
msgid "\"%s\" is not a valid bitmap file"
msgstr "\"%s\" ei ole korrektne pildifail"
-#: ../src/defaults.c:2574
+#: ../src/defaults.c:2743
#, c-format
msgid "out of memory reading bitmap file \"%s\""
-msgstr "mälu lõppes pildifaili \"%s\" lugemisel"
+msgstr "pildifaili \"%s\" lugemisel lõppes mälu"
-#: ../src/defaults.c:2613 ../src/defaults.c:2646
+#: ../src/defaults.c:2782 ../src/defaults.c:2815
msgid "bad number of arguments in cursor specification"
msgstr "vigane argumentide arv kursori kirjelduses"
-#: ../src/defaults.c:2629
+#: ../src/defaults.c:2798
#, c-format
msgid "unknown builtin cursor name \"%s\""
msgstr "tundmatu sisseehitatud kursori nimi: \"%s\""
-#: ../src/defaults.c:2656 ../src/defaults.c:2668
+#: ../src/defaults.c:2825 ../src/defaults.c:2837
#, c-format
msgid "could not find cursor bitmap file \"%s\""
-msgstr "ei õnnestu leida kursori pildifaili \"%s\""
+msgstr "kursori pildifaili \"%s\" pole võimalik leida"
-#: ../src/defaults.c:2715
+#: ../src/defaults.c:2884
#, c-format
msgid "Error in cursor specification for key \"%s\""
msgstr "Viga võtme \"%s\" kursori kirjelduses"
-#: ../src/defaults.c:2800
+#: ../src/defaults.c:2969
msgid "could not render texture for icon background"
-msgstr "tekstuuri renderdamine ikooni taustapildiks ei õnnestu"
+msgstr "tekstuuri pole võimalik ikooni taustapildiks renderdada"
+
+#: ../src/defaults.c:3597 ../src/defaults.c:3672
+#, c-format
+msgid "Invalid arguments for option \"%s\""
+msgstr "Vigased argumendid võtmele \"%s\""
+
+#: ../src/defaults.c:3604 ../src/defaults.c:3679
+#, c-format
+msgid "Could not find image \"%s\" for option \"%s\""
+msgstr "Pilti \"%s\" pole võtmele \"%s\" võimalik leida"
-#: ../src/dialog.c:135
+#: ../src/defaults.c:3610 ../src/defaults.c:3687
+#, c-format
+msgid "Could not load image \"%s\" for option \"%s\""
+msgstr "Pilti \"%s\" pole võtmele \"%s\" võimalik laadida"
+
+#: ../src/defaults.c:3622
+msgid "Invalid split sizes for SwitchPanel back image."
+msgstr ""
+
+#: ../src/defaults.c:3695
+#, c-format
+msgid "Invalid number of arguments for option \"%s\""
+msgstr "Vigane argumentide arv võtmele \"%s\""
+
+#: ../src/dialog.c:147
msgid "Save workspace state"
-msgstr "Salvesta töölaua olek"
+msgstr "Töölaua oleku salvestamine"
-#: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558
-#: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248
+#: ../src/dialog.c:192 ../src/dialog.c:732 ../src/dock.c:547
+#: ../src/dockedapp.c:432 ../src/rootmenu.c:198 ../src/rootmenu.c:248
#: ../src/rootmenu.c:264
msgid "Cancel"
-msgstr "Tühista"
+msgstr "Loobu"
-#: ../src/dialog.c:277
+#: ../src/dialog.c:290
msgid "Could not open directory "
-msgstr "Ei õnnestu avada kataloogi "
+msgstr "Pole võimalik avada kataloogi "
-#: ../src/dialog.c:332
+#: ../src/dialog.c:345
msgid "Could not load image file "
-msgstr "Ei õnnestu avada pildifaili "
+msgstr "Pole võimalik avada pildifaili "
-#: ../src/dialog.c:663
+#: ../src/dialog.c:659
msgid "Directories"
msgstr "Kataloogid"
-#: ../src/dialog.c:672
+#: ../src/dialog.c:668
msgid "Icons"
msgstr "Ikoonid"
-#: ../src/dialog.c:705
+#: ../src/dialog.c:701
msgid "Preview"
msgstr "Eelvaade"
-#: ../src/dialog.c:718
+#: ../src/dialog.c:714
msgid "File Name:"
msgstr "Faili nimi:"
-#: ../src/dialog.c:742
+#: ../src/dialog.c:738
msgid "Choose File"
msgstr "Vali fail"
-#: ../src/dialog.c:760 ../src/dialog.c:762
+#: ../src/dialog.c:757 ../src/dialog.c:759
msgid "Icon Chooser"
-msgstr "Ikooni valija"
+msgstr "Ikoonivalik"
-#: ../src/dialog.c:1219 ../src/dialog.c:1329
+#: ../src/dialog.c:1197 ../src/dialog.c:1305
#, c-format
msgid "Version %s"
msgstr "Versioon %s"
-#: ../src/dialog.c:1326
+#: ../src/dialog.c:1303
msgid "Window Manager for X"
msgstr "X'i aknahaldur"
-#: ../src/dialog.c:1349
+#: ../src/dialog.c:1326
#, c-format
msgid "Using visual 0x%x: %s %ibpp "
-msgstr "Kasutan visuaali 0x%x: %s %ibpp "
+msgstr "Kasutatakse visuaali 0x%x: %s %ibpp "
-#: ../src/dialog.c:1357
+#: ../src/dialog.c:1334
msgid "(32 thousand colors)\n"
msgstr "(32 tuhat värvi)\n"
-#: ../src/dialog.c:1360
+#: ../src/dialog.c:1337
msgid "(64 thousand colors)\n"
msgstr "(64 tuhat värvi)\n"
-#: ../src/dialog.c:1364
+#: ../src/dialog.c:1341
msgid "(16 million colors)\n"
msgstr "(16 miljonit värvi)\n"
-#: ../src/dialog.c:1367
+#: ../src/dialog.c:1344
#, c-format
msgid "(%d colors)\n"
msgstr "(%d värvi)\n"
-#: ../src/dialog.c:1377
+#: ../src/dialog.c:1354
#, c-format
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n"
-msgstr "Eraldatud mälu kokku: %i kB. Mälu kasutuses: %i kB.\n"
+msgstr "Kogu eraldatud mälu: %i kB. Kogu kasutusel olev mälu: %i kB.\n"
-#: ../src/dialog.c:1384
+#: ../src/dialog.c:1361
msgid "Supported image formats: "
msgstr "Toetatud pildivormingud: "
-#: ../src/dialog.c:1391
+#: ../src/dialog.c:1368
msgid ""
"\n"
"Additional support for: "
@@ -383,11 +420,11 @@
"\n"
"Lisaks on toetatud: "
-#: ../src/dialog.c:1414
+#: ../src/dialog.c:1385
msgid " and "
msgstr " ja "
-#: ../src/dialog.c:1424
+#: ../src/dialog.c:1395
msgid ""
"\n"
"Sound disabled"
@@ -395,7 +432,7 @@
"\n"
"Heli on keelatud"
-#: ../src/dialog.c:1426
+#: ../src/dialog.c:1397
msgid ""
"\n"
"Sound enabled"
@@ -403,28 +440,46 @@
"\n"
"Heli on lubatud"
-#: ../src/dialog.c:1450
+#: ../src/dialog.c:1402
+msgid ", VirtualDesktop enabled"
+msgstr ", VirtualDesktop on lubatud"
+
+#: ../src/dialog.c:1404
+msgid ", VirtualDesktop disabled"
+msgstr ", VirtualDesktop on keelatud"
+
+#: ../src/dialog.c:1408
+msgid "\n"
+msgstr "\n"
+
+#: ../src/dialog.c:1410
+msgid "Solaris "
+msgstr "Solaris "
+
+#: ../src/dialog.c:1412
+msgid "Xinerama: "
+msgstr "Xinerama: "
+
+#: ../src/dialog.c:1446
msgid "Info"
-msgstr "Info"
+msgstr "Andmed"
-#: ../src/dialog.c:1473
-msgid "Merry X'mas!"
+#: ../src/dialog.c:1470
+msgid "Merry Christmas!"
msgstr "Häid jõule!"
-#: ../src/dialog.c:1543
+#: ../src/dialog.c:1540
msgid ""
" Window Maker is free software; you can redistribute it and/or\n"
"modify it under the terms of the GNU General Public License as\n"
"published by the Free Software Foundation; either version 2 of the\n"
"License, or (at your option) any later version.\n"
"\n"
-"\n"
" Window Maker is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty\n"
"of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"See the GNU General Public License for more details.\n"
"\n"
-"\n"
" You should have received a copy of the GNU General Public\n"
"License along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
@@ -436,13 +491,11 @@
"avaldatud; kas Litsentsi versioon number 2 või (vastavalt\n"
"Teie valikule) ükskõik milline hilisem versioon.\n"
"\n"
-"\n"
"Seda programmi levitatakse lootuses, et see on kasulik, kuid\n"
"ILMA IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDI\n"
"GARANTIITA või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS.\n"
"Üksikasjade suhtes vaata GNU Üldist Avalikku Litsentsi.\n"
"\n"
-"\n"
"Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia\n"
"koos selle programmiga, kui ei, siis kontakteeruge Free\n"
"Software Foundation'iga, 59 Temple Place - Suite 330,\n"
@@ -450,17 +503,17 @@
#: ../src/dialog.c:1564
msgid "Legal"
-msgstr "Litsentsiinfo"
+msgstr "Litsentsiandmed"
-#: ../src/dialog.c:1715 ../src/startup.c:395
+#: ../src/dialog.c:1720
msgid "cannot open connection for crashing dialog panel. Aborting."
-msgstr "ei õnnestu luua ühendust avariipaneeliga. Annan alla."
+msgstr "krahhidialoogi paneeliga pole võimalik ühendust luua. Annan alla."
-#: ../src/dialog.c:1741
+#: ../src/dialog.c:1746
msgid "Fatal error"
msgstr "Fataalviga"
-#: ../src/dialog.c:1752
+#: ../src/dialog.c:1757
#, c-format
msgid ""
"Window Maker received signal %i\n"
@@ -469,41 +522,41 @@
"Window Maker võttis vastu signaali %i\n"
"(%s)."
-#: ../src/dialog.c:1755
+#: ../src/dialog.c:1760
#, c-format
msgid "Window Maker received signal %i."
msgstr "Window Maker võttis vastu signaali %i."
-#: ../src/dialog.c:1764
+#: ../src/dialog.c:1769
msgid ""
" This fatal error occured probably due to a bug. Please fill the included "
"BUGFORM and report it to bugs@windowmaker.org."
msgstr ""
" See fataalviga on arvatavasti põhjustatud programmi enese veast. Palun "
-"täitke kaasasolev vigadest teatamise vorm (BUGFORM) ja saatke see aadressil "
+"täida kaasasolev vigadest teatamise vorm (BUGFORM) ja saada see aadressil "
"bugs@windowmaker.org."
-#: ../src/dialog.c:1773
+#: ../src/dialog.c:1778
msgid "What do you want to do now?"
msgstr "Mida sa nüüd soovid teha?"
-#: ../src/dialog.c:1779
+#: ../src/dialog.c:1784
msgid "Select action"
-msgstr "Vali tegevus"
+msgstr "Tegevuse valimine"
-#: ../src/dialog.c:1780
+#: ../src/dialog.c:1785
msgid "Abort and leave a core file"
-msgstr "Lõpetan töö ja salvestan mälutõmmise"
+msgstr "Töö lõpetamine ja mälutõmmise salvestan"
-#: ../src/dialog.c:1781
+#: ../src/dialog.c:1786
msgid "Restart Window Maker"
-msgstr "Taaskäivitan Window Makeri"
+msgstr "Window Maker'i taaskäivitamine"
-#: ../src/dialog.c:1782
+#: ../src/dialog.c:1787
msgid "Start alternate window manager"
-msgstr "Käivitan alternatiivse aknahalduri"
+msgstr "Alternatiivse aknahalduri käivitamine"
-#: ../src/dialog.c:1960
+#: ../src/dialog.c:1965
msgid ""
"Window Maker is part of the GNUstep project.\n"
"The GNUstep project aims to create a free\n"
@@ -517,441 +570,387 @@
msgstr ""
"Window Maker on osa GNUstep projektist. GNUstep\n"
"projekti eesmärgiks on OpenStep(tm) kirjelduse\n"
-"(objektorienteeritud framework graafiliste\n"
-"multiplatvorm rakenduste jaoks) vaba\n"
+"(objektorienteeritud raamistik graafiliste\n"
+"mitme platvormi toega rakenduste jaoks) vaba\n"
"implementatsiooni loomine. Lisaeesmärgiks on \n"
-"ka sellel baseeruva ka arenduskeskkonna ja\n"
-"kasutaja töölauakeskkonna loomine. Lisateabe\n"
-"saamiseks palun külasada saidi www.gnustep.org"
+"ka sellel põhineva arenduskeskkonna ja kasutaja\n"
+"töölauakeskkonna loomine. Lisateabe saamiseks\n"
+"palun külasta saiti www.gnustep.org"
-#: ../src/dialog.c:1980
+#: ../src/dialog.c:1988
msgid "About GNUstep"
msgstr "GNUstep'ist lähemalt"
-#: ../src/dock.c:213
+#: ../src/dock.c:193
#, c-format
msgid "Type the name for workspace %i:"
msgstr "Sisesta töölaua %i nimi:"
-#: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409
+#: ../src/dock.c:194 ../src/dock.c:1132 ../src/dock.c:1135 ../src/dock.c:3419
msgid "Rename Workspace"
msgstr "Töölaua ümbernimetamine"
-#: ../src/dock.c:520 ../src/dock.c:528
+#: ../src/dock.c:509 ../src/dock.c:517
msgid "Warning"
msgstr "Hoiatus"
-#: ../src/dock.c:521
+#: ../src/dock.c:510
msgid ""
"Some icons cannot be made omnipresent. Please make sure that no other icon "
"is docked in the same positions on the other workspaces and the Clip is not "
"full in some workspace."
msgstr ""
-"Mõningaid ikoone ei ole võimalik kõikidel töölaudadel nähtavaks teha. "
-"Veenduge, et teistel töölaudadel ei ole ükski ikoon dokitud samale "
+"Mõningaid ikoone pole võimalik kõikidel töölaudadel nähtavaks teha. "
+"Veendu, et teistel töölaudadel ei ole ükski ikoon dokitud samale "
"positsioonile ja Klamber ei ole mõnel töölaual täis."
-#: ../src/dock.c:529
+#: ../src/dock.c:518
msgid ""
"Icon cannot be made omnipresent. Please make sure that no other icon is "
"docked in the same position on the other workspaces and the Clip is not full "
"in some workspace."
msgstr ""
-"Ikooni ei ole võimalik kõikidel töölaudadel nähtavaks teha. Veenduge, et "
+"Ikooni ei ole võimalik kõikidel töölaudadel nähtavaks teha. Veendu, et "
"teistel töölaudadel ei ole ükski ikoon dokitud samale positsioonile ja "
"Klamber ei ole mõnel töölaual täis."
-#: ../src/dock.c:556
+#: ../src/dock.c:545
msgid "Workspace Clip"
msgstr "Töölaua Klamber"
-#: ../src/dock.c:557
+#: ../src/dock.c:546
msgid "All selected icons will be removed!"
msgstr "Kõik valitud ikoonid eemaldatakse!"
-#: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445
+#: ../src/dock.c:598 ../src/dock.c:1147 ../src/dock.c:1149 ../src/dock.c:3455
msgid "Keep Icon"
msgstr "Hoia ikooni"
-#: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278
+#: ../src/dock.c:599 ../src/dock.c:2139 ../src/dock.c:2276
msgid "Type the command used to launch the application"
msgstr "Tipi korraldus, mida kasutada rakenduse käivitamiseks"
-#: ../src/dock.c:965
+#: ../src/dock.c:954
#, c-format
msgid "could not launch application %s\n"
msgstr "ei õnnestu käivitada rakendust %s\n"
-#: ../src/dock.c:1020
+#: ../src/dock.c:1010
msgid "could not create workspace submenu for Clip menu"
msgstr "ei õnnestu luua klambrimenüüle töölaua alammenüüd"
-#: ../src/dock.c:1078
+#: ../src/dock.c:1069
msgid "could not create options submenu for Clip menu"
msgstr "ei õnnestu luua klambrimenüüle valikute alammenüüd"
-#: ../src/dock.c:1082 ../src/dock.c:1130
+#: ../src/dock.c:1073 ../src/dock.c:1121
msgid "Keep on Top"
-msgstr "Hoitakse esiplaanil"
+msgstr "Hoia esiplaanil"
-#: ../src/dock.c:1088
+#: ../src/dock.c:1079
msgid "Collapsed"
msgstr "Ahendatud"
-#: ../src/dock.c:1094
+#: ../src/dock.c:1085
msgid "Autocollapse"
msgstr "Automaatselt ahenev"
-#: ../src/dock.c:1100
+#: ../src/dock.c:1091
msgid "Autoraise"
msgstr "Automaatselt esile tõusev"
-#: ../src/dock.c:1106
+#: ../src/dock.c:1097
msgid "Autoattract Icons"
msgstr "Ikoonide automaatne külgehaakimine"
-#: ../src/dock.c:1136
+#: ../src/dock.c:1127
msgid "Clip Options"
msgstr "Klambri valikud"
-#: ../src/dock.c:1146
+#: ../src/dock.c:1137
msgid "Selected"
msgstr "Valitud"
-#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436
+#: ../src/dock.c:1142 ../src/dock.c:1145 ../src/dock.c:3446
msgid "Select All Icons"
msgstr "Vali kõik ikoonid"
-#: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453
+#: ../src/dock.c:1151 ../src/dock.c:1153 ../src/dock.c:3463
msgid "Move Icon To"
msgstr "Teisalda ikoon->"
-#: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464
+#: ../src/dock.c:1158 ../src/dock.c:1161 ../src/dock.c:3474
msgid "Remove Icon"
msgstr "Eemalda ikoon"
-#: ../src/dock.c:1172
+#: ../src/dock.c:1163
msgid "Attract Icons"
msgstr "Haagi ikoonid külge"
-#: ../src/dock.c:1175
+#: ../src/dock.c:1166
msgid "Launch"
msgstr "Käivita programm"
-#: ../src/dock.c:1183
+#: ../src/dock.c:1174
msgid "Settings..."
-msgstr "Määrangud..."
+msgstr "Sätted..."
-#: ../src/dock.c:1548 ../src/dock.c:1655
+#: ../src/dock.c:1538 ../src/dock.c:1645
#, c-format
msgid "bad value in docked icon state info %s"
msgstr "vigane väärtus dokitud ikooni olekuinfos %s "
-#: ../src/dock.c:1663
+#: ../src/dock.c:1653
#, c-format
msgid "bad value in docked icon position %i,%i"
msgstr "vigane väärtus dokitud ikooni asukohal %i,%i"
-#: ../src/dock.c:1683
+#: ../src/dock.c:1673
#, c-format
msgid "bad value in dock state info:%s"
msgstr "vigane väärtus doki olekuinfos:%s"
-#: ../src/dock.c:1919
+#: ../src/dock.c:1923
msgid "there are too many icons stored in dock. Ignoring what doesn't fit"
msgstr ""
"dokki on salvestatud liiga palju ikoone. Eiran neid, mida ei suuda hallata"
#. icon->forced_dock = 1;
-#: ../src/dock.c:2136 ../src/dock.c:2277
+#: ../src/dock.c:2138 ../src/dock.c:2275
msgid "Dock Icon"
msgstr "Dokin ikooni"
-#: ../src/dock.c:3323
+#: ../src/dock.c:3333
#, c-format
msgid "Could not execute command \"%s\""
msgstr "Ei õnnestu täita korraldust \"%s\""
-#: ../src/dock.c:3415
+#: ../src/dock.c:3425
msgid "Toggle Omnipresent"
msgstr "Näita/ära näita kõigil töölaudadel"
-#: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:413
-#: ../src/winspector.c:1389
+#: ../src/dock.c:3430 ../src/winmenu.c:414 ../src/winspector.c:1383
msgid "Omnipresent"
-msgstr "Näha kõigil töölaudadel"
+msgstr "Nähtav kõigil töölaudadel"
-#: ../src/dock.c:3434
+#: ../src/dock.c:3444
msgid "Unselect All Icons"
msgstr "Tühista ikoonivalik"
-#: ../src/dock.c:3443
+#: ../src/dock.c:3453
msgid "Keep Icons"
msgstr "Hoia ikoone"
-#: ../src/dock.c:3451
+#: ../src/dock.c:3461
msgid "Move Icons To"
msgstr "Teisalda ikoonid->"
-#: ../src/dock.c:3462
+#: ../src/dock.c:3472
msgid "Remove Icons"
msgstr "Eemalda ikoonid"
-#: ../src/dock.c:3493 ../src/kwm.c:643
+#: ../src/dock.c:3503
msgid "Bring Here"
msgstr "Too siia"
-#: ../src/dockedapp.c:149
+#: ../src/dockedapp.c:150
#, c-format
msgid "could not find icon %s, used in a docked application"
msgstr "ei leia dokitud rakenduses kasutatavat ikooni %s"
-#: ../src/dockedapp.c:229
+#: ../src/dockedapp.c:230
#, c-format
msgid "Could not open specified icon file: %s"
msgstr "Ei õnnestu avada määratud ikoonifaili: %s"
-#: ../src/dockedapp.c:231
+#: ../src/dockedapp.c:232
msgid "Ignore"
msgstr "Eira"
-#: ../src/dockedapp.c:333
+#: ../src/dockedapp.c:334
msgid "Start when Window Maker is started"
-msgstr "Käivita koos Window Maker'iga"
+msgstr "Käivitada koos Window Maker'iga"
-#: ../src/dockedapp.c:340
+#: ../src/dockedapp.c:341
msgid "Lock (prevent accidental removal)"
msgstr "Lukustatud (ei saa kogemata kustutada)"
-#: ../src/dockedapp.c:344
+#: ../src/dockedapp.c:345
msgid "Application path and arguments"
-msgstr "Rakenduse tee ja argumendid"
+msgstr "Rakenduse rada ja argumendid"
-#: ../src/dockedapp.c:357
+#: ../src/dockedapp.c:358
msgid "Command for middle-click launch"
msgstr "Keskmise nupu korraldus"
-#: ../src/dockedapp.c:371
+#: ../src/dockedapp.c:372
#, c-format
msgid "%s will be replaced with current selection"
-msgstr "%s asendatakse antud valikuga"
+msgstr "%s asendatakse käesoleva valikuga"
-#: ../src/dockedapp.c:376
+#: ../src/dockedapp.c:377
msgid "Command for files dropped with DND"
msgstr "Korraldus DND abil saadetud failidele"
-#: ../src/dockedapp.c:390
+#: ../src/dockedapp.c:391
#, c-format
msgid "%d will be replaced with the file name"
msgstr "%d asendatakse failinimega"
-#: ../src/dockedapp.c:394
+#: ../src/dockedapp.c:395
msgid "DND support was not compiled in"
-msgstr "DND toetus ei ole sisse kompileeritud"
+msgstr "DND tugi pole sisse kompileeritud"
-#: ../src/dockedapp.c:399
+#: ../src/dockedapp.c:400
msgid "Icon Image"
msgstr "Ikooni pilt"
-#: ../src/dockedapp.c:413 ../src/winspector.c:1527
+#: ../src/dockedapp.c:414 ../src/winspector.c:1521
msgid "Browse..."
-msgstr "Kuva..."
+msgstr "Sirvi..."
-#: ../src/dockedapp.c:466
+#: ../src/dockedapp.c:475
msgid "Docked Application Settings"
-msgstr "Dokitud rakenduse määrangud"
+msgstr "Dokitud rakenduse sätted"
-#: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:456
+#: ../src/framewin.c:647 ../src/framewin.c:742 ../src/menu.c:463
#: ../src/texture.c:594
#, c-format
msgid "could not render texture: %s"
-msgstr "ei õnnestu renderdada tekstuuri %s"
+msgstr "tekstuuri pole võimalik renderdada: %s"
-#: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699
-#: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724
-#: ../src/icon.c:350 ../src/menu.c:485
+#: ../src/framewin.c:670 ../src/framewin.c:681 ../src/framewin.c:697
+#: ../src/framewin.c:708 ../src/framewin.c:715 ../src/framewin.c:722
+#: ../src/icon.c:360 ../src/menu.c:492
#, c-format
msgid "error rendering image:%s"
msgstr "viga pildi renderdamisel:%s"
-#: ../src/framewin.c:777
+#: ../src/framewin.c:775
#, c-format
msgid "error rendering image: %s"
msgstr "viga pildi renderdamisel: %s"
-#: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401
-msgid "out of memory while updating GNOME hints"
-msgstr "mälu lõppes GNOME vihjete uuendamise käigus"
-
-#: ../src/icon.c:229 ../src/wdefaults.c:443
+#: ../src/icon.c:239 ../src/wdefaults.c:443
#, c-format
msgid "error loading image file \"%s\""
msgstr "viga pildifaili \"%s\" laadimisel"
-#: ../src/icon.c:491 ../src/icon.c:500
+#: ../src/icon.c:503 ../src/icon.c:512
#, c-format
msgid "could not create directory %s"
-msgstr "ei õnnestu luua kataloogi %s"
+msgstr "kataloogi %s pole võimalik luua"
-#: ../src/icon.c:767
+#: ../src/icon.c:782
#, c-format
msgid "could not find default icon \"%s\""
-msgstr "ei õnnestu leida vaikimisi kasutatavat ikooni \"%s\""
+msgstr "vaikimisi kasutatavat ikooni \"%s\" pole võimalik leida"
-#: ../src/icon.c:773
+#: ../src/icon.c:788
#, c-format
msgid "could not load default icon \"%s\":%s"
-msgstr "Ei õnnestu laadida vaikimisi kasutatavat ikooni \"%s\":%s"
-
-#.
-#. * Warning: If you make some change that affects the order of the
-#. * entries, you must update the command #defines in the top of
-#. * this file.
-#.
-#: ../src/kwm.c:633 ../src/winmenu.c:436 ../src/winmenu.c:571
-msgid "Maximize"
-msgstr "Maksimeeri"
-
-#: ../src/kwm.c:634 ../src/winmenu.c:566
-msgid "Unmaximize"
-msgstr "Taasta suurus"
-
-#: ../src/kwm.c:635 ../src/winmenu.c:444 ../src/winmenu.c:557
-msgid "Miniaturize"
-msgstr "Minimeeri"
-
-#: ../src/kwm.c:636 ../src/winmenu.c:552
-msgid "Deminiaturize"
-msgstr "Ava aken"
-
-#: ../src/kwm.c:638
-msgid "Not Omnipresent"
-msgstr "Näita ainult ühel töölaual"
-
-#: ../src/kwm.c:639
-msgid "Move"
-msgstr "Liiguta"
-
-#: ../src/kwm.c:640
-msgid "Resize"
-msgstr "Muuda suurust"
-
-#.
-#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
-#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
-#.
-#: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:501
-msgid "Close"
-msgstr "Sulge"
-
-#: ../src/kwm.c:642 ../src/winmenu.c:485
-msgid "Move To"
-msgstr "Teisalda"
+msgstr "vaikimisi kasutatavat ikooni \"%s\" pole võimalik laadida:%s"
-#: ../src/kwm.c:1096
-msgid "%a(Run Command,Type the command to run:)"
-msgstr "%a(Käivita korraldus,Sisesta korraldus, mida käivitada:)"
-
-#: ../src/main.c:222
+#: ../src/main.c:220
msgid "failed to restart Window Maker."
-msgstr "Window Makeri taaskäivitamine ebaõnnestus."
+msgstr "Tõrge Window Maker'i taaskäivitamisel."
-#: ../src/main.c:225
+#: ../src/main.c:223
#, c-format
msgid "could not exec %s"
-msgstr "ei õnnestu käivitada %s"
+msgstr "%s pole võimalik käivitada"
-#: ../src/main.c:271
+#: ../src/main.c:269
msgid "Could not execute command: "
-msgstr "Ei õnnestu käivitada korraldust: "
+msgstr "Korraldust pole võimalik käivitada : "
-#: ../src/main.c:428
+#: ../src/main.c:426
#, c-format
msgid "%s aborted.\n"
msgstr "%s katkestatud.\n"
-#: ../src/main.c:439
+#: ../src/main.c:437
#, c-format
msgid "Usage: %s [options]\n"
-msgstr "Kasuta: %s [valikud]\n"
+msgstr "Kasutamine: %s [võtmed]\n"
-#: ../src/main.c:440
+#: ../src/main.c:438
msgid "The Window Maker window manager for the X window system"
-msgstr "Window Maker on aknahaldur X window system'ile"
+msgstr "Window Maker on X window system'i aknahaldur"
-#: ../src/main.c:442
+#: ../src/main.c:440
msgid " -display host:dpy\tdisplay to use"
-msgstr " -display host:dpy\tmäärab, millist kuva kasutada"
+msgstr " -display host:dpy\tkasutatava kuva määramine"
-#: ../src/main.c:444
+#: ../src/main.c:442
msgid " --no-cpp \t\tdisable preprocessing of configuration files"
-msgstr " --no-cpp \t\tkeelab häälestusfailide eeltöötluse"
+msgstr " --no-cpp \t\tseadistusfailide eeltöötluse keelamine"
-#: ../src/main.c:446
+#: ../src/main.c:444
msgid " --no-dock\t\tdo not open the application Dock"
-msgstr " --no-dock\t\tkeelab rakenduste doki avamise"
+msgstr " --no-dock\t\trakenduste doki avamise keelamine"
-#: ../src/main.c:447
+#: ../src/main.c:445
msgid " --no-clip\t\tdo not open the workspace Clip"
-msgstr " --no-clip\t\tkeelab töölaua klambri avamise"
+msgstr " --no-clip\t\ttöölaua klambri avamise keelamine"
-#: ../src/main.c:448
+#: ../src/main.c:446
msgid " --no-autolaunch\tdo not autolaunch applications"
-msgstr " --no-autolaunch\tkeelab rakenduste automaatse käivitamise"
+msgstr " --no-autolaunch\trakenduste automaatse käivitamise keelamine"
-#: ../src/main.c:449
+#: ../src/main.c:447
msgid " --dont-restore\t\tdo not restore saved session"
-msgstr " --dont-restore\tei taasta salvestatud seanssi"
+msgstr " --dont-restore\tsalvestatud seansi taastamise keelamine"
-#: ../src/main.c:451
+#: ../src/main.c:449
msgid " --locale locale\tlocale to use"
-msgstr " --locale locale\t\tmillist locale't kasutada"
+msgstr " --locale locale\t\tkasutatava lokaadi määramine"
-#: ../src/main.c:453
+#: ../src/main.c:451
msgid ""
" --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals"
msgstr ""
-" --create-stdcmap\tloo standardne värvikaardi vihje PseudoColor visuaalile"
+" --create-stdcmap\tstandardse värvikaardi vihje loomine PseudoColor visuaalile"
-#: ../src/main.c:454
+#: ../src/main.c:452
msgid " --visual-id visualid\tvisual id of visual to use"
msgstr " --visual-id visualid\tkasutatava visuaali id"
-#: ../src/main.c:455
+#: ../src/main.c:453
msgid " --static\t\tdo not update or save configurations"
-msgstr " --static\t\thäälestusi ei salvestata ega uuendata"
+msgstr " --static\t\tseadistusi ei salvestata ega uuendata"
-#: ../src/main.c:456
+#: ../src/main.c:454
msgid " --no-polling\t\tdo not periodically check for configuration updates"
-msgstr " --no-polling\t\tkeelab ümberhäälestustuste regulaarse kontrolli"
+msgstr " --no-polling\t\tümberseadistustuste korrapärase kontrolli keelamine"
-#: ../src/main.c:458
+#: ../src/main.c:456
msgid " --synchronous\t\tturn on synchronous display mode"
-msgstr " --synchronous\t\tlülitab sisse sünkroonse ekraanirezhiimi"
+msgstr " --synchronous\t\tsünkroonse ekraanirezhiimi sisselülitamine"
-#: ../src/main.c:460
+#: ../src/main.c:458
msgid " --version\t\tprint version and exit"
-msgstr " --version\t\tväljastab versiooninumbri ja lõpetab programmi töö"
+msgstr " --version\t\tversiooninumbri väljastamine ja programmi töö lõpetamine"
-#: ../src/main.c:461
+#: ../src/main.c:459
msgid " --help\t\t\tshow this message"
-msgstr " --help\t\t\tnäitab seda teadet"
+msgstr " --help\t\t\tselle teate näitamine"
-#: ../src/main.c:474
+#: ../src/main.c:473
#, c-format
msgid ""
"could not find user GNUstep directory (%s).\n"
"Make sure you have installed Window Maker correctly and run wmaker.inst"
msgstr ""
-"ei õnnestu leida kasutaja GNUstep kataloogi (%s).\n"
+"kasutaja GNUstep kataloogi (%s) pole võimalik leida.\n"
"Veendu, et Window Maker on korrektselt paigaldatud ja käivita wmaker.inst"
-#: ../src/main.c:479
+#: ../src/main.c:478
#, c-format
msgid "could not find user GNUstep directory (%s)."
-msgstr "ei õnnestu leida kasutaja GNUstep kataloogi (%s)"
+msgstr "kasutaja GNUstep kataloogi (%s) pole võimalik leida."
-#: ../src/main.c:482
+#: ../src/main.c:481
msgid ""
"There was an error while creating GNUstep directory, please make sure you "
"have installed Window Maker correctly and run wmaker.inst"
@@ -959,190 +958,142 @@
"Viga GNUstep kataloogi loomise käigus. Palun veendu, et Window Maker on "
"korrektselt paigaldatud ja käivita wmaker.inst"
-#: ../src/main.c:485
+#: ../src/main.c:484
#, c-format
msgid "%s directory created with default configuration."
-msgstr "%s kataloog loodi vaikimisi häälestusega"
+msgstr "%s kataloog loodi vaikimisi seadistusega"
-#: ../src/main.c:505 ../src/main.c:510
+#: ../src/main.c:506 ../src/main.c:511
#, c-format
msgid "%s:could not execute initialization script"
-msgstr "%s:ei õnnestu käivitada lähtestamisskripti"
+msgstr "%s:lähtestamisskripti pole võimalik käivitada"
-#: ../src/main.c:530 ../src/main.c:535
+#: ../src/main.c:533 ../src/main.c:538
#, c-format
msgid "%s:could not execute exit script"
-msgstr "%s:ei õnnestu käivitada lõpetamisskripti"
+msgstr "%s:lõpetamisskripti pole võimalik käivitada"
-#: ../src/main.c:651 ../src/main.c:659 ../src/main.c:667 ../src/main.c:687
+#: ../src/main.c:622 ../src/main.c:722 ../src/main.c:730 ../src/main.c:738
+#: ../src/main.c:758
#, c-format
msgid "too few arguments for %s"
msgstr "liiga vähe argumente %s jaoks"
-#: ../src/main.c:671
+#: ../src/main.c:742
#, c-format
msgid "bad value for visualid: \"%s\""
msgstr "vigane visualid väärtus: \"%s\""
-#: ../src/main.c:695
+#: ../src/main.c:766
#, c-format
msgid "%s: invalid argument '%s'\n"
msgstr "%s: vigane argument '%s'\n"
-#: ../src/main.c:696
+#: ../src/main.c:767
#, c-format
msgid "Try '%s --help' for more information\n"
-msgstr "Et saada rohkem informatsiooni, proovi '%s --help'\n"
+msgstr "Täiendava teabe saamiseks proovi kasutada '%s --help'\n"
-#: ../src/main.c:727
+#: ../src/main.c:802
msgid "X server does not support locale"
msgstr "X server ei toeta lokaliseerimist"
-#: ../src/main.c:731
+#: ../src/main.c:806
msgid "cannot set locale modifiers"
-msgstr ""
+msgstr "lokaadimuujaid pole võimalik määrata"
-#: ../src/main.c:747
+#: ../src/main.c:822
#, c-format
msgid "could not open display \"%s\""
-msgstr "ei õnnestu avada kuva \"%s\""
+msgstr "kuva \"%s\" pole võimalik avada"
-#: ../src/menu.c:1255
+#: ../src/menu.c:1276
msgid "could not grab keyboard"
-msgstr "ei suuda klaviatuuriga ühendust saada"
-
-#: ../src/menu.c:2569
-#, c-format
-msgid "bad value in menus state info:%s"
-msgstr "vigane väärtus menüüde olekuinfos:%s"
+msgstr "klaviatuuriga pole võimalik ühendust saada"
-#: ../src/menureader.c:264 ../src/rootmenu.c:730
+#: ../src/menu.c:2615
#, c-format
-msgid "%s:could not stat menu"
-msgstr "%s:ei õnnestu tuvastada menüü atribuute"
-
-#: ../src/menureader.c:341 ../src/menureader.c:380
-#, c-format
-msgid "could not stat() menu file '%s'"
-msgstr "ei õnnestu lugeda (stat()) menüüfaili '%s' atribuute"
+msgid "bad value in menus state info: %s"
+msgstr "vigane väärtus menüüde olekuandmetes:%s"
-#: ../src/menureader.c:416
-#, c-format
-msgid "could not find menu file '%s' referenced in WMRootMenu"
-msgstr "ei õnnestu leida menüüfaili '%s', millele viitab WMRootMenu"
-
-#: ../src/menureader.c:423
-#, c-format
-msgid "could not find any usable menu files. Please check '%s'"
-msgstr ""
-"ei õnnestu leida ühtegi kasutuskõlblikku menüüfaili. Palun kontrolli '%s'"
-
-#: ../src/menureader.c:438 ../src/rootmenu.c:1664
-#, c-format
-msgid ""
-"using default menu file \"%s\" as the menu referenced in WMRootMenu could "
-"not be found "
-msgstr ""
-"ei õnnestu leida vaikimisi kasutatavat menüüfaili \"%s\", millele viitab "
-"WMRootMenu"
-
-#: ../src/menureader.c:457
-#, c-format
-msgid ""
-"invalid content in menu file '%s'.\n"
-"It should either be a property list menu or the path to the file, enclosed "
-"in \"."
-msgstr ""
-
-#: ../src/misc.c:71
+#: ../src/misc.c:65
#, c-format
msgid "could not define value for %s for cpp"
-msgstr "ei õnnestu defineerida %s väärtust cpp jaoks"
+msgstr "%s väärtust pole võimalik cpp jaoks kirjedada"
-#: ../src/misc.c:101
+#: ../src/misc.c:95
#, c-format
msgid "could not get password entry for UID %i"
-msgstr "ei õnnestu leida UID %i paroolikirjet"
+msgstr "UID %i paroolikirjet pole võimalik leida"
-#: ../src/misc.c:126
+#: ../src/misc.c:121
#, c-format
msgid "your machine is misconfigured. HOSTNAME is set to %s"
-msgstr "Teie masin on häälestamata. HOSTNAME väärtus on %s"
+msgstr "Teie masin on seadistamata. HOSTNAME väärtus on %s"
-#: ../src/misc.c:132
+#: ../src/misc.c:127
#, c-format
msgid "your machine is misconfigured. HOST is set to %s"
-msgstr "Teie masin on häälestamata. HOST väärtus on %s"
+msgstr "Teie masin on seadistamata. HOST väärtus on %s"
-#: ../src/misc.c:630
+#: ../src/misc.c:622
msgid "Program Arguments"
msgstr "Programmi argumendid"
-#: ../src/misc.c:631
+#: ../src/misc.c:623
msgid "Enter command arguments:"
msgstr "Sisesta käsu argumendid:"
-#: ../src/misc.c:724
-msgid "unable to get dropped data from DND drop"
-msgstr "ei õnnestu vastu võtta DND saadetud andmeid"
-
-#: ../src/misc.c:732
-msgid "error getting dropped data from DND drop"
-msgstr "viga DND saadetud andmete vastuvõtmisel"
-
-#: ../src/misc.c:738
-msgid "out of memory while getting data from DND drop"
-msgstr "mälu lõppes DND saadetud andmete vastuvõtmisel "
-
-#: ../src/misc.c:783 ../src/misc.c:923
+#: ../src/misc.c:737 ../src/misc.c:875
#, c-format
msgid "out of memory during expansion of \"%s\""
msgstr "mälu lõppes \"%s\" laiendamise käigus"
-#: ../src/misc.c:837
+#: ../src/misc.c:791
msgid "out of memory during expansion of \"%w\""
msgstr "mälu lõppes \"%w\" laiendamise käigus"
-#: ../src/misc.c:855
+#: ../src/misc.c:809
msgid "out of memory during expansion of \"%W\""
msgstr "mälu lõppes \"%W\" laiendamise käigus"
-#: ../src/misc.c:871
+#: ../src/misc.c:825
+#, c-format
msgid "out of memory during expansion of \"%a\""
msgstr "mälu lõppes \"%a\" laiendamise käigus"
-#: ../src/misc.c:902
+#: ../src/misc.c:854
#, c-format
msgid "out of memory during expansion of \"%d\""
msgstr "mälu lõppes \"%d\" laiendamise käigus"
-#: ../src/misc.c:916
+#: ../src/misc.c:868
msgid "selection not available"
msgstr "valik ei ole kättesaadav"
-#: ../src/misc.c:972 ../src/misc.c:978
+#: ../src/misc.c:912 ../src/misc.c:918
#, c-format
msgid "bad window name value in %s state info"
-msgstr "vigane akna nimi %s olekuinfos"
+msgstr "vigane akna nimi %s olekuandmetes"
-#: ../src/misc.c:1235
+#: ../src/misc.c:1157
msgid "could not send message to background image helper"
-msgstr "ei õnnestu saata teadet taustapildiprogrammile"
+msgstr "taustapildi abiprogrammile pole võimalik teadet saata"
#: ../src/pixmap.c:235
#, c-format
msgid "could not load mask bitmap file \"%s\". Won't use mask"
-msgstr "ei õnnestu laadida bitmap maskifaili \"%s\". Maski ei saa kasutada"
+msgstr "bitmap maskifaili \"%s\" pole võimalik laadida. Maski ei saa kasutada"
#: ../src/resources.c:44
#, c-format
msgid "could not parse color \"%s\""
-msgstr "ei õnnestu sõeluda värvi \"%s\""
+msgstr "värvi \"%s\" pole võimalik analüüsida"
#: ../src/resources.c:48
#, c-format
msgid "could not allocate color \"%s\""
-msgstr "ei õnnestu eraldada värvi \"%s\""
+msgstr "värvi \"%s\" pole võimalik eraldada"
#: ../src/rootmenu.c:196 ../src/rootmenu.c:198
msgid "Exit"
@@ -1150,7 +1101,7 @@
#: ../src/rootmenu.c:197
msgid "Exit window manager?"
-msgstr "Kas lõpetan aknahalduri töö?"
+msgstr "Kas lõpetada aknahalduri töö?"
#: ../src/rootmenu.c:245
msgid "Close X session"
@@ -1165,6 +1116,14 @@
"On võimalik, et suletakse ka mõned rakendused, mis sisaldavad salvestamata "
"andmeid."
+#.
+#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
+#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
+#.
+#: ../src/rootmenu.c:248 ../src/winmenu.c:501
+msgid "Close"
+msgstr "Sulge"
+
#: ../src/rootmenu.c:261
msgid "Kill X session"
msgstr "X seansi kõrvaldamine"
@@ -1177,190 +1136,202 @@
"Kas kõrvaldame X seansi?\n"
"(kõik rakendused suletakse)"
-#: ../src/rootmenu.c:536
+#: ../src/rootmenu.c:544
#, c-format
msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s"
msgstr "%s:vigane kiirklahvi kirjeldus \"%s\" kirjele %s"
-#: ../src/rootmenu.c:544
+#: ../src/rootmenu.c:552
#, c-format
msgid "%s:invalid key in shortcut \"%s\" for entry %s"
msgstr "%s: vigane klahv kiirkorralduses \"%s\" kirjele %s"
-#: ../src/rootmenu.c:597
+#: ../src/rootmenu.c:605
#, c-format
msgid "%s: unmatched '\"' in menu file"
msgstr "%s: ebamäärane '\"' menüüfailis"
-#: ../src/rootmenu.c:647
+#: ../src/rootmenu.c:655
#, c-format
msgid "%s: missing command"
msgstr "%s: puuduv korraldus"
-#: ../src/rootmenu.c:679
+#: ../src/rootmenu.c:687
#, c-format
msgid "invalid OPEN_MENU specification: %s"
msgstr "vigane OPEN_MENU kirjeldus: %s"
#: ../src/rootmenu.c:738
#, c-format
+msgid "%s:could not stat menu"
+msgstr "%s:menüü rekvisiite pole võimalik tuvastada"
+
+#: ../src/rootmenu.c:746
+#, c-format
msgid "%s:could not stat menu:%s"
-msgstr "%s:ei õnnestu tuvastada menüü atribuute:%s"
+msgstr "%s:menüü rekvisiite pole võimalik tuvastada:%s"
-#: ../src/rootmenu.c:756
+#: ../src/rootmenu.c:764
#, c-format
msgid "too many parameters in OPEN_MENU: %s"
-msgstr "liiga palju parameetreid OPEN_MENU's: %s"
+msgstr "liiga palju OPEN_MENU parameetreid: %s"
-#: ../src/rootmenu.c:800
+#: ../src/rootmenu.c:808
msgid ""
"There are more than one WORKSPACE_MENU commands in the applications menu. "
"Only one is allowed."
msgstr ""
-"Rakenduste menüüs on rohkem kui üks WORKSPACE_MENU korraldus. Lubatud on "
-"ainult üks."
+"Rakenduste menüüs on mitu WORKSPACE_MENU korraldust. Lubatud on ainult üks."
-#: ../src/rootmenu.c:834
+#: ../src/rootmenu.c:842
msgid ""
"There are more than one WINDOWS_MENU commands in the applications menu. Only "
"one is allowed."
msgstr ""
-"Rakenduste menüüs on rohkem kui üks WINDOWS_MENU korraldus. Lubatud on "
-"ainult üks."
+"Rakenduste menüüs on mitu WINDOWS_MENU korraldust. Lubatud on ainult üks."
-#: ../src/rootmenu.c:839
+#: ../src/rootmenu.c:847
msgid "Window List"
msgstr "Akende nimekiri"
-#: ../src/rootmenu.c:868 ../src/rootmenu.c:886 ../src/rootmenu.c:896
+#: ../src/rootmenu.c:876 ../src/rootmenu.c:894 ../src/rootmenu.c:904
#, c-format
msgid "%s:missing parameter for menu command \"%s\""
-msgstr "%s:puuduvad parameetrid menüükorraldusele \"%s\""
+msgstr "%s:menüükorraldusel \"%s\" puuduvad parameetrid"
-#: ../src/rootmenu.c:964
+#: ../src/rootmenu.c:972
#, c-format
msgid "%s:unknown command \"%s\" in menu config."
-msgstr "%s:tundmatu käsk menüü seadistuses: \"%s\"."
+msgstr "%s:menüü seadistuses on tundmatu käsk \"%s\"."
-#: ../src/rootmenu.c:972
+#: ../src/rootmenu.c:980
#, c-format
msgid "%s:can't add shortcut for entry \"%s\""
-msgstr "%s:ei õnnestu lisada kiirkorraldust kirjele \"%s\""
+msgstr "%s:kiirkorraldust pole võimalik kirjele \"%s\" lisada"
-#: ../src/rootmenu.c:1109
+#: ../src/rootmenu.c:1117
#, c-format
msgid "%s:maximal line size exceeded in menu config: %s"
-msgstr "%s:maksimaalne rea pikkus ületatud menüü seadistuses: %s"
+msgstr "%s:menüü seadistustes on suurim rea pikkus ületatud: %s"
-#: ../src/rootmenu.c:1131 ../src/rootmenu.c:1224 ../src/rootmenu.c:1326
+#: ../src/rootmenu.c:1139 ../src/rootmenu.c:1232 ../src/rootmenu.c:1336
#, c-format
msgid "%s:missing command in menu config: %s"
-msgstr "%s:puudub korraldus menüü seadistuses: %s"
+msgstr "%s:menüü seadistuses puudub korraldus: %s"
-#: ../src/rootmenu.c:1161
+#: ../src/rootmenu.c:1169
#, c-format
msgid "%s:syntax error in menu file:END declaration missing"
-msgstr "%s:süntaksi viga menüüfaili: puudub lõputunnus END"
+msgstr "%s:menüüfaili süntaksi viga: puudub lõputunnus END"
-#: ../src/rootmenu.c:1190 ../src/rootmenu.c:1290
+#: ../src/rootmenu.c:1198 ../src/rootmenu.c:1300
msgid "could not make arguments for menu file preprocessor"
-msgstr "ei suuda luua argumente menüüfaili eeltöötlejale"
+msgstr "menüüfaili eeltöötlejale pole võimalik argumente luua"
-#: ../src/rootmenu.c:1197 ../src/rootmenu.c:1298
+#: ../src/rootmenu.c:1205 ../src/rootmenu.c:1308
#, c-format
msgid "%s:could not open/preprocess menu file"
-msgstr "%s:ei suuda avada/eeltöödelda menüüfaili"
+msgstr "%s:menüüfaili pole võimalik avada või eeltöödelda"
-#: ../src/rootmenu.c:1209 ../src/rootmenu.c:1311
+#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321
#, c-format
msgid "%s:could not open menu file"
-msgstr "%s:menüüfaili avamine ebaõnnestus"
+msgstr "%s:menüüfaili pole võimalik avada"
-#: ../src/rootmenu.c:1236
+#: ../src/rootmenu.c:1244
#, c-format
msgid "%s:invalid menu file. MENU command is missing"
msgstr "%s:vigane menüüfail. Puudub MENU käsk"
-#: ../src/rootmenu.c:1245
+#: ../src/rootmenu.c:1253
msgid "error reading preprocessed menu data"
-msgstr "viga eelnevalt töödeldud menüüandmete lugemisel"
+msgstr "viga eeltöödeldud menüüandmete lugemisel"
-#: ../src/rootmenu.c:1338
+#: ../src/rootmenu.c:1348
#, c-format
msgid "%s:no title given for the root menu"
msgstr "%s:juurmenüü pealkiri on puudu"
-#: ../src/rootmenu.c:1429 ../src/rootmenu.c:1502 ../src/rootmenu.c:1543
+#: ../src/rootmenu.c:1439 ../src/rootmenu.c:1512 ../src/rootmenu.c:1553
#, c-format
msgid "out of memory while constructing directory menu %s"
-msgstr "mälu lõppes menüü %s loomise käigus"
+msgstr "menüü %s loomise käigus lõppes mälu"
-#: ../src/rootmenu.c:1439
+#: ../src/rootmenu.c:1449
#, c-format
msgid "%s:could not stat file \"%s\" in menu directory"
-msgstr "%s:ei õnnestu lugeda faili \"%s\" atribuute menüükataloogis"
+msgstr "%s:faili \"%s\" rekvisiite pole menüükataloogist võimalik lugeda"
-#: ../src/rootmenu.c:1597
+#: ../src/rootmenu.c:1607
msgid "Commands"
msgstr "Korraldused"
-#: ../src/rootmenu.c:1600
+#: ../src/rootmenu.c:1610
msgid "Restart"
msgstr "Taaskäivitamine"
-#: ../src/rootmenu.c:1601
+#: ../src/rootmenu.c:1611
msgid "Exit..."
msgstr "Lõpetamine..."
-#: ../src/rootmenu.c:1646
+#: ../src/rootmenu.c:1656
#, c-format
msgid "could not find menu file \"%s\" referenced in WMRootMenu"
-msgstr "ei õnnestu leida menüüfaili \"%s\", millele viitab WMRootMenu"
+msgstr "WMRootMenu poolt viidatud menüüfaili \"%s\" pole võimalik leida"
-#: ../src/rootmenu.c:1653
+#: ../src/rootmenu.c:1663
#, c-format
msgid "could not access menu \"%s\" referenced in WMRootMenu"
-msgstr "ei õnnestu ligi pääseda menüüle \"%s\", millele viitab WMRootMenu"
+msgstr "WMRootMenu poolt viidatud menüüle \"%s\" pole võimalik ligi pääseda"
-#: ../src/rootmenu.c:1687 ../src/rootmenu.c:1763
+#: ../src/rootmenu.c:1674
+#, c-format
+msgid ""
+"using default menu file \"%s\" as the menu referenced in WMRootMenu could "
+"not be found "
+msgstr ""
+"WMRootMenu poolt viidatud vaikimisi kasutatavat menüüfaili \"%s\" pole "
+"võimalik leida"
+
+#: ../src/rootmenu.c:1697 ../src/rootmenu.c:1773
#, c-format
msgid "%s:format error in root menu configuration \"%s\""
-msgstr "%s:vormingu viga juurmenüü häälestuses \"%s\""
+msgstr "%s:vormingu viga juurmenüü seadistuses \"%s\""
-#: ../src/rootmenu.c:1851
+#: ../src/rootmenu.c:1855
msgid ""
"The applications menu could not be loaded. Look at the console output for a "
"detailed description of the errors."
msgstr ""
-"Ei õnnestu lugeda rakenduste menüüd. Põhjalikuma vigade kirjelduse "
+"Rakenduste menüüd pole võimalik lugeda. Põhjalikuma vigade kirjelduse "
"lugemiseks vaata konsooliväljundit."
-#: ../src/screen.c:740
+#: ../src/screen.c:709
#, c-format
msgid "could not initialize graphics library context: %s"
-msgstr "ei õnnesta lähtestada graafikateegi konteksti: %s"
+msgstr "graafikateegi konteksti pole võimalik lähtestada: %s"
-#: ../src/screen.c:771
-msgid "could not do initialization of WINGs widget set"
-msgstr ""
+#: ../src/screen.c:737
+msgid "could not initialize WINGs widget set"
+msgstr "WINGs vidinakomplekti pole võimalik lähtestada"
-#: ../src/screen.c:1139
+#: ../src/screen.c:1148
#, c-format
msgid "could not save session state in %s"
-msgstr "ei õnnestu salvestada seansi olekut %s"
+msgstr "seansi olekut %s pole võimalik salvestada"
-#: ../src/session.c:183 ../src/wdefaults.c:588 ../src/winspector.c:454
+#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:459
#, c-format
msgid "can't convert \"%s\" to boolean"
-msgstr "ei õnnestu \"%s\" teisendamine boolean väärtuseks"
+msgstr "väärtust \"%s\" pole võimalik tõeväärtuseks teisendada"
-#: ../src/session.c:1021
+#: ../src/session.c:1018
msgid "out of memory while saving session state"
-msgstr "mälu lõppes seansi oleku salvestamise käigus"
+msgstr "seansi oleku salvestamise käigus lõppes mälu"
-#: ../src/session.c:1104
+#: ../src/session.c:1101
msgid "end of memory while saving session state"
-msgstr "mälu lõpp seansi oleku salvestamise käigus"
+msgstr "seansi oleku salvestamise käigus lõppes mälu"
#. This is not fatal but can mean the session manager exited.
#. * If the session manager exited normally we would get a
@@ -1368,156 +1339,87 @@
#. * If the sm was the last client of session, then we'll die
#. * anyway, otherwise we can continue doing our stuff.
#.
-#: ../src/session.c:1242
+#: ../src/session.c:1239
msgid "connection to the session manager was lost"
msgstr "ühendus seansihalduriga on katkenud"
-#: ../src/stacking.c:79
+#: ../src/stacking.c:81
msgid "could not get window list!!"
-msgstr "ei õnnestu saada akende nimekirja!!"
+msgstr "akende nimekirja pole võimalik saada!!"
-#: ../src/startup.c:202
+#: ../src/startup.c:194
#, c-format
msgid "internal X error: %s\n"
msgstr "X'i sisemine viga: %s\n"
-#: ../src/startup.c:260
-#, c-format
-msgid "got signal %i (%s) - restarting\n"
-msgstr "sain signaali %i (%s) - stardin uuesti\n"
-
-#: ../src/startup.c:262
-#, c-format
-msgid "got signal %i - restarting\n"
-msgstr "sain signaali %i - stardin uuesti\n"
-
-#: ../src/startup.c:272
-#, c-format
-msgid "got signal %i (%s) - rereading defaults\n"
-msgstr "sain signaali %i (%s) - loen vaikeväärtused uuesti\n"
-
-#: ../src/startup.c:274
-#, c-format
-msgid "got signal %i - rereading defaults\n"
-msgstr "sain signaali %i - loen vaikeväärtused uuesti\n"
-
-#: ../src/startup.c:284
-#, c-format
-msgid "got signal %i (%s) - exiting...\n"
-msgstr "sain signaali %i (%s) - lõpetan...\n"
-
-#: ../src/startup.c:286
-#, c-format
-msgid "got signal %i - exiting...\n"
-msgstr "sain signaali %i - lõpetan...\n"
-
-#: ../src/startup.c:329
-#, c-format
-msgid "got signal %i (%s)\n"
-msgstr "sain signaali %i (%s)\n"
-
-#: ../src/startup.c:331
-#, c-format
-msgid "got signal %i\n"
-msgstr "sain signaali %i\n"
-
-#: ../src/startup.c:342
-msgid ""
-"crashed while trying to do some post-crash cleanup. Aborting immediatelly."
-msgstr ""
-"järjekordne avarii ajal, mil tehti avariijärgseid puhastusi. Katkestan "
-"viivitamatult."
-
-#. we try to restart Window Maker
-#: ../src/startup.c:407
-msgid "trying to restart Window Maker..."
-msgstr "proovin taaskäivitada Window Maker'it..."
-
-#: ../src/startup.c:412
-msgid "trying to start alternate window manager..."
-msgstr "proovin käivitada alternatiivset aknahaldurit"
-
-#: ../src/startup.c:417
-msgid "failed to start alternate window manager. Aborting."
-msgstr "ei õnnestu käivitada alternatiivset aknahaldurit. Annan alla."
-
-#: ../src/startup.c:419
-msgid ""
-"a fatal error has occured, probably due to a bug. Please fill the included "
-"BUGFORM and report it."
-msgstr ""
-"aset on leidnud fataalne viga, arvatavasti programmi viga. Palun täida "
-"programmiga kaasa tulnud vearaport (BUGFORM) ja saada see programmi "
-"autoritele."
-
-#: ../src/startup.c:895
+#: ../src/startup.c:771
#, c-format
msgid "icon size is configured to %i, but it's too small. Using 16, instead\n"
msgstr ""
-"ikooni suuruseks on määratud %i, kuid see on liiga väike. Kasutan suurust "
-"16\n"
+"ikooni suuruseks on määratud %i, kuid see on liiga väike. Kasutatakse "
+"suurust 16\n"
-#: ../src/startup.c:923
+#: ../src/startup.c:800
msgid "XKB is not supported. KbdModeLock is automatically disabled."
msgstr "Puudub XKB tugi. KbdModeLock on automaatselt keelatud."
-#: ../src/startup.c:942
+#: ../src/startup.c:819
msgid "it seems that there is already a window manager running"
msgstr "paistab, et mingi aknahaldur juba töötab"
-#: ../src/startup.c:948
+#: ../src/startup.c:825
#, c-format
msgid "could not manage screen %i"
-msgstr "ei õnnestu hallata ekraani %i"
+msgstr "ekraani %i pole võimalik hallata"
-#: ../src/startup.c:1016
+#: ../src/startup.c:884
msgid "could not manage any screen"
-msgstr "ei õnnestu hallata ühtegi ekraani"
+msgstr "ühtegi ekraani pole võimalik hallata"
-#: ../src/switchmenu.c:137
+#: ../src/switchmenu.c:145
msgid "Windows"
msgstr "Aknad"
#: ../src/texture.c:329 ../src/texture.c:371
#, c-format
msgid "image file \"%s\" used as texture could not be found."
-msgstr "ei õnnestu leida tekstuuriks kasutatavat pildifaili \"%s\"."
+msgstr "tekstuuriks kasutatavat pildifaili \"%s\" pole võimalik leida."
#: ../src/texture.c:335 ../src/texture.c:377
#, c-format
msgid "could not load texture pixmap \"%s\":%s"
-msgstr "ei õnnestu laadida tekstuuri pixmap faili \"%s\":%s"
+msgstr "tekstuuri pildifaili \"%s\" pole võimalik laadida:%s"
#: ../src/texture.c:437
#, c-format
msgid "library \"%s\" cound not be opened."
-msgstr "ei õnnestu avada teeki \"%s\""
+msgstr "teeki \"%s\" pole võimalik avada."
#: ../src/texture.c:446
#, c-format
msgid "function \"%s\" not found in library \"%s\""
-msgstr "ei leia funktsiooni \"%s\" teegist \"%s\""
+msgstr "funktsiooni \"%s\" pole teegist \"%s\" võimalik leida"
#: ../src/texture.c:453
msgid "function textures not supported on this system, sorry."
-msgstr "tekstuurifunktsioon ei ole selles süsteemis toetatud."
+msgstr "tekstuurifunktsioon pole selles süsteemis toetatud. vabandust."
#: ../src/texture.c:598
msgid "could not allocate image buffer"
-msgstr "ei õnnestu eraldada pildi puhvrit"
+msgstr "pildipuhvrit pole võimalik eraldada"
#: ../src/wdefaults.c:437
#, c-format
msgid "could not find icon file \"%s\""
-msgstr "ei õnnestu leida ikoonifaili \"%s\""
+msgstr "ikoonifaili \"%s\" pole võimalik leida"
-#: ../src/window.c:2884 ../src/window.c:3023
+#: ../src/window.c:3041 ../src/window.c:3182
msgid ""
"the NumLock, ScrollLock or similar key seems to be turned on.\n"
"Turn it off or some mouse actions and keyboard shortcuts will not work."
msgstr ""
"klahvid NumLock, ScrollLock (või sarnased) näivad olevat sisse lülitatud.\n"
-"Lülita need välja või muidu ei tööta mõned hiire toimingud ja klaviatuuri\n"
+"Lülita need välja või muidu ei tööta mõned hiiretoimingud ja klaviatuuri\n"
"kiirkorraldused."
#: ../src/winmenu.c:125
@@ -1528,24 +1430,37 @@
msgstr ""
"Programm suletakse jõuga.\n"
"Kõik salvestamata andmed lähevad kaotsi.\n"
-"Kas soovite seda teha?"
+"Kas soovid seda teha?"
-#: ../src/winmenu.c:267 ../src/winmenu.c:276
+#: ../src/winmenu.c:268 ../src/winmenu.c:277
msgid "Set Shortcut"
msgstr "Määra kiirkorraldus"
-#: ../src/winmenu.c:354 ../src/winmenu.c:399
+#: ../src/winmenu.c:355 ../src/winmenu.c:400
msgid "could not create submenu for window menu"
msgstr "ei õnnestu luua aknamenüü alammenüüd"
-#: ../src/winmenu.c:403
+#: ../src/winmenu.c:404
msgid "Keep on top"
msgstr "Hoia esiplaanil"
-#: ../src/winmenu.c:408
+#: ../src/winmenu.c:409
msgid "Keep at bottom"
msgstr "Hoia tagaplaanil"
+#.
+#. * Warning: If you make some change that affects the order of the
+#. * entries, you must update the command #defines in the top of
+#. * this file.
+#.
+#: ../src/winmenu.c:437 ../src/winmenu.c:571
+msgid "Maximize"
+msgstr "Maksimeeri"
+
+#: ../src/winmenu.c:445 ../src/winmenu.c:557
+msgid "Miniaturize"
+msgstr "Minimeeri"
+
#: ../src/winmenu.c:453 ../src/winmenu.c:588
msgid "Shade"
msgstr "Keri kokku"
@@ -1558,6 +1473,10 @@
msgid "Select"
msgstr "Vali"
+#: ../src/winmenu.c:485
+msgid "Move To"
+msgstr "Teisalda"
+
#: ../src/winmenu.c:490
msgid "Attributes..."
msgstr "Rekvisiidid..."
@@ -1566,89 +1485,97 @@
msgid "Options"
msgstr "Valikud"
+#: ../src/winmenu.c:552
+msgid "Deminiaturize"
+msgstr "Ava aken"
+
+#: ../src/winmenu.c:566
+msgid "Unmaximize"
+msgstr "Taasta suurus"
+
#: ../src/winmenu.c:583
msgid "Unshade"
msgstr "Keri lahti"
-#: ../src/winspector.c:387
+#: ../src/winspector.c:392
#, c-format
msgid "Could not find icon \"%s\" specified for this window"
-msgstr "Ei õnnestu leida selle akna jaoks määratud ikooni \"%s\""
+msgstr "Selle akna jaoks määratud ikooni \"%s\" pole võimalik leida"
-#: ../src/winspector.c:404
+#: ../src/winspector.c:409
#, c-format
msgid "Could not open specified icon \"%s\":%s"
-msgstr "Ei õnnestu avada kirjeldatud ikooni \"%s\":%s"
+msgstr "Kirjeldatud ikooni \"%s\" pole võimalik avada:%s"
-#: ../src/winspector.c:1135
+#: ../src/winspector.c:1129
#, c-format
msgid "Inspecting %s.%s"
-msgstr "Vaatlen %s.%s"
+msgstr "%s.%s vaatlemine"
-#: ../src/winspector.c:1161
+#: ../src/winspector.c:1155
msgid "Click in the window you wish to inspect."
msgstr "Kliki aknale, mida soovid vaadelda."
-#: ../src/winspector.c:1200
+#: ../src/winspector.c:1194
msgid ""
"The configuration will apply to all\n"
"windows that have their WM_CLASS\n"
"property set to the above selected\n"
"name, when saved."
msgstr ""
-"Häälestuse salvestamisel laieneb see\n"
+"Seadistuste salvestamisel laieneb see\n"
"kõigile akendele, mille WM_CLASS\n"
"omadus on üks ülalloetletud nimedest."
-#: ../src/winspector.c:1229
+#: ../src/winspector.c:1223
msgid "Save"
msgstr "Salvesta"
-#: ../src/winspector.c:1237
+#: ../src/winspector.c:1231
msgid "Apply"
msgstr "Rakenda"
-#: ../src/winspector.c:1243
+#: ../src/winspector.c:1237
msgid "Reload"
msgstr "Taasta"
-#: ../src/winspector.c:1252 ../src/winspector.c:1262
+#: ../src/winspector.c:1246 ../src/winspector.c:1256
msgid "Window Specification"
msgstr "Akna kirjeldus"
-#: ../src/winspector.c:1253
+#: ../src/winspector.c:1247
msgid "Window Attributes"
msgstr "Akna rekvisiidid"
-#: ../src/winspector.c:1254
+#: ../src/winspector.c:1248
msgid "Advanced Options"
msgstr "Laiendatud valikud"
-#: ../src/winspector.c:1255
+#: ../src/winspector.c:1249
msgid "Icon and Initial Workspace"
msgstr "Ikoon ja töölaud"
-#: ../src/winspector.c:1256
+#: ../src/winspector.c:1250
msgid "Application Specific"
msgstr "Rakendusele omane"
-#: ../src/winspector.c:1270
+#: ../src/winspector.c:1264
msgid "Defaults for all windows"
msgstr "Vaikimisi kõigile akendele"
-#: ../src/winspector.c:1324
+#: ../src/winspector.c:1318
msgid "Select window"
msgstr "Vali aken"
-#: ../src/winspector.c:1338
+#: ../src/winspector.c:1332
msgid "Attributes"
msgstr "Rekvisiidid"
-#: ../src/winspector.c:1349
+#: ../src/winspector.c:1343
msgid "Disable titlebar"
msgstr "Tiitliriba peidus"
-#: ../src/winspector.c:1351
+#: ../src/winspector.c:1345
msgid ""
"Remove the titlebar of this window.\n"
"To access the window commands menu of a window\n"
@@ -1656,298 +1583,304 @@
"equivalent shortcut, if you changed the default\n"
"settings)."
msgstr ""
-"Eemaldab akna tiitliriba. Ilma tiitliribata\n"
-"akna parameetreid saab muuta,\n"
-"vajutadades Control+Esc (või kui\n"
-"kontrollklahve on muudetud, siis sellele\n"
+"Aknalt tiitliriba eemaldamine. Ilma\n"
+"tiitliribata akna parameetreid saab\n"
+"muuta,vajutadades Control+Esc (või kui\n"
+"juhtklahve on muudetud, siis sellele\n"
"vastavat klahvikombinatsiooni)."
-#: ../src/winspector.c:1358
+#: ../src/winspector.c:1352
msgid "Disable resizebar"
msgstr "Suuruse muutmise riba peidus"
-#: ../src/winspector.c:1360
+#: ../src/winspector.c:1354
msgid "Remove the resizebar of this window."
-msgstr "Eemaldab riba, mille abil muudetakse akna suurust."
+msgstr "Akna suuruse muutmise riba eemaldamine sellelt aknalt."
-#: ../src/winspector.c:1363
+#: ../src/winspector.c:1357
msgid "Disable close button"
msgstr "Sulgemisnupp peidus"
-#: ../src/winspector.c:1365
+#: ../src/winspector.c:1359
msgid "Remove the `close window' button of this window."
-msgstr "Eemaldab sulgemisnupu akna tiitliribalt."
+msgstr "Akna sulgemisnupu eemaldamine selle akna tiitliribalt."
-#: ../src/winspector.c:1368
+#: ../src/winspector.c:1362
msgid "Disable miniaturize button"
msgstr "Minimeerimisnupp peidus"
-#: ../src/winspector.c:1370
+#: ../src/winspector.c:1364
msgid "Remove the `miniaturize window' button of the window."
-msgstr "Eemaldab minimeerimisnupu akna tiitliribalt."
+msgstr "Akna minimeerimisnupu eemaldamine selle akna tiitliribalt."
-#: ../src/winspector.c:1373
+#: ../src/winspector.c:1367
msgid "Disable border"
msgstr "Raam peidus"
-#: ../src/winspector.c:1375
+#: ../src/winspector.c:1369
msgid "Remove the 1 pixel black border around the window."
-msgstr "Eemaldab akna ümbert ühepikslise musta raami."
+msgstr "Akna ümbert ühepikslise musta raami eemaldamine."
-#: ../src/winspector.c:1378
+#: ../src/winspector.c:1372
msgid "Keep on top (floating)"
-msgstr "Hoia esiplaanil"
+msgstr "Hoitakse esiplaanil (ujuv)"
-#: ../src/winspector.c:1380
+#: ../src/winspector.c:1374
msgid ""
"Keep the window over other windows, not allowing\n"
"them to cover it."
-msgstr "Hoiab akent teiste akende suhtes esiplaanil."
+msgstr "Akna hoidmine teiste akende peal."
-#: ../src/winspector.c:1384
+#: ../src/winspector.c:1378
+#, fuzzy
msgid "Keep at bottom (sunken)"
-msgstr "Hoia tagaplaanil"
+msgstr "Hoitakse tagaplaanil"
-#: ../src/winspector.c:1386
+#: ../src/winspector.c:1380
msgid "Keep the window under all other windows."
-msgstr "Hoiab akent kõigi teiste akende taga."
+msgstr "Akna hoidmine kõigi teiste akende taga."
-#: ../src/winspector.c:1391
+#: ../src/winspector.c:1385
msgid "Make window present in all workspaces."
-msgstr "Näitab akent kõigil töölaudadel."
+msgstr "Aken on kõigil töölaudadel."
-#: ../src/winspector.c:1394
+#: ../src/winspector.c:1388
msgid "Start miniaturized"
-msgstr "Käivita minimeerituna"
+msgstr "Käivitatakse minimeerituna"
-#: ../src/winspector.c:1396
+#: ../src/winspector.c:1390
msgid ""
"Make the window be automatically miniaturized when it's\n"
"first shown."
-msgstr "Programmi käivitamise hetkel minimeerib akna."
+msgstr ""
+"Programmi esmasel näitamisel minimeeritakse\n"
+"aken automaatselt."
-#: ../src/winspector.c:1400
+#: ../src/winspector.c:1394
msgid "Start maximized"
msgstr "Käivita maksimeerituna"
-#: ../src/winspector.c:1402
+#: ../src/winspector.c:1396
msgid ""
"Make the window be automatically maximized when it's\n"
"first shown."
-msgstr "Programmi käivitamise hetkel maksimeerib akna."
+msgstr ""
+"Programmi esmasel näitamisel maksimeeritakse\n"
+"aken automaatselt."
-#: ../src/winspector.c:1406
+#: ../src/winspector.c:1400
msgid "Full screen maximization"
-msgstr "Maksimeeri üle kogu ekraani"
+msgstr "Maksimeeritakse üle kogu ekraani"
-#: ../src/winspector.c:1408
+#: ../src/winspector.c:1402
msgid ""
"Make the window use the whole screen space when it's\n"
"maximized. The titlebar and resizebar will be moved\n"
"to outside the screen."
msgstr ""
-"Lubab akent maksimeerida kogu ekraani ulatuses.\n"
-"Kui lubatud, siis akna maksimeerimise korral\n"
-"jäävad akna tiitliriba ja suuruse muutmise riba\n"
-"väljapoole ekraani piirkonda."
+"Akent lubatakse suurendada kogu ekraani ulatuses.\n"
+"Akna tiitliriba ja suuruse muutmise riba jäävad\n"
+"siis väljaspoole ekraani piirkonda."
-#: ../src/winspector.c:1425
+#: ../src/winspector.c:1419
msgid "Advanced"
msgstr "Laiendatud võimalused"
-#: ../src/winspector.c:1442
+#: ../src/winspector.c:1436
msgid "Do not bind keyboard shortcuts"
msgstr "Kiirklahvidele ei reageerita"
-#: ../src/winspector.c:1444
+#: ../src/winspector.c:1438
msgid ""
"Do not bind keyboard shortcuts from Window Maker\n"
"when this window is focused. This will allow the\n"
"window to receive all key combinations regardless\n"
"of your shortcut configuration."
msgstr ""
-"Keelab fookuses oleval aknal reageerimase\n"
+"Fookuses oleval aknal keelatakse reageerimast\n"
"Window Maker'i kiirklahvidele. See võimaldab\n"
"aknal vastu võtta kõiki klaviatuurilt tulevaid\n"
"koode."
-#: ../src/winspector.c:1450
+#: ../src/winspector.c:1444
msgid "Do not bind mouse clicks"
msgstr "Hiirevajutustele ei reageerita"
-#: ../src/winspector.c:1452
+#: ../src/winspector.c:1446
msgid ""
"Do not bind mouse actions, such as `Alt'+drag\n"
-"in the window (when alt is the modifier you haveconfigured)."
+"in the window (when alt is the modifier you have\n"
+"configured)."
msgstr ""
-"Keelab aknal reageerimast hiiretoimingutele.\n"
+"Aknal keelatakse reageerimast hiiretoimingutele.\n"
"Näiteks `Alt'+lohistamine (kui alt on määratud\n"
"muuteklahviks)."
-#: ../src/winspector.c:1457
+#: ../src/winspector.c:1451
msgid "Do not show in the window list"
msgstr "Akende nimekirjas ei näidata"
-#: ../src/winspector.c:1459
+#: ../src/winspector.c:1453
msgid "Do not list the window in the window list menu."
-msgstr "Keelab akna nime näitamise akende nimekirjas."
+msgstr "Akna nime ei näidata akende nimekirjas."
-#: ../src/winspector.c:1462
+#: ../src/winspector.c:1456
msgid "Do not let it take focus"
msgstr "Akna fokuseerimine keelatud"
-#: ../src/winspector.c:1464
+#: ../src/winspector.c:1458
msgid ""
"Do not let the window take keyboard focus when you\n"
"click on it."
msgstr ""
-"Keelab akna fokuseerimise. Aknale ei\n"
+"Akna fokuseerimine on keelatud. Aknale ei\n"
"mõju klaviatuurilt saabuvad vajutused."
-#: ../src/winspector.c:1468
+#: ../src/winspector.c:1462
msgid "Keep inside screen"
msgstr "Hoia ekraani sees"
-#: ../src/winspector.c:1470
+#: ../src/winspector.c:1464
msgid ""
"Do not allow the window to move itself completely\n"
"outside the screen. For bug compatibility.\n"
msgstr ""
-"Keelab akna liigutamise\n"
-"väljapoole ekraani pinda.\n"
+"Aknent ei saa liigutada\n"
+"väljaspoole ekraani pinda.\n"
-#: ../src/winspector.c:1474
+#: ../src/winspector.c:1468
msgid "Ignore 'Hide Others'"
-msgstr "Eira käsku 'Peida teised aknad'"
+msgstr "Käsu 'Peida teised aknad' eiramine"
-#: ../src/winspector.c:1476
+#: ../src/winspector.c:1470
msgid ""
"Do not hide the window when issuing the\n"
"`HideOthers' command."
msgstr ""
-"Keelab reageerimise käsule\n"
-"\"Peida teised aknad\"."
+"Akent ei peideta käsu\n"
+"\"Peida teised aknad\" puhul."
-#: ../src/winspector.c:1480
+#: ../src/winspector.c:1474
msgid "Ignore 'Save Session'"
-msgstr "Eira seansi salvestamist"
+msgstr "Seansi salvestamist eiratakse"
-#: ../src/winspector.c:1482
+#: ../src/winspector.c:1476
msgid ""
"Do not save the associated application in the\n"
"session's state, so that it won't be restarted\n"
"together with other applications when Window Maker\n"
"starts."
msgstr ""
-"Keelab akna andmete salvestamise seansi\n"
-"andmetesse. Rakendust ei käivitata koos\n"
-"seansi koosseisu kuuluvate akendega."
+"Akna andmeid ei salvestata seansi\n"
+"andmetesse ja seetõttu ei käivitata\n"
+"rakendust koos seansi koosseisu\n"
+"kuuluvate akendega."
-#: ../src/winspector.c:1488
+#: ../src/winspector.c:1482
msgid "Emulate application icon"
-msgstr "Emuleeri rakenduse ikooni"
+msgstr "Rakenduse ikooni emuleeritakse"
-#: ../src/winspector.c:1490
+#: ../src/winspector.c:1484
msgid ""
"Make this window act as an application that provides\n"
"enough information to Window Maker for a dockable\n"
"application icon to be created."
-msgstr "Loob aknale dokitava rakenduse ikooni."
+msgstr ""
+"Aknale luuakse dokitava rakenduse ikoon, mille alusel\n"
+"Window Maker on suuteline looma rakenduse ikooni."
-#: ../src/winspector.c:1496
+#: ../src/winspector.c:1490
msgid "Disable language button"
msgstr "Keelenupp peidus"
-#: ../src/winspector.c:1498
+#: ../src/winspector.c:1492
msgid "Remove the `toggle language' button of the window."
msgstr ""
-"Eemaldab keele sisse- ja väljalülitamise\n"
-"nupu akna tiitliribalt."
+"Keele sisse- ja väljalülitamise\n"
+"nupp on akna tiitliribalt eemaldatud."
-#: ../src/winspector.c:1515
+#: ../src/winspector.c:1509
msgid "Miniwindow Image"
msgstr "Pisiakna pilt"
-#: ../src/winspector.c:1542
+#: ../src/winspector.c:1536
msgid "Icon filename:"
msgstr "Ikoonifaili nimi:"
-#: ../src/winspector.c:1555
+#: ../src/winspector.c:1549
msgid "Ignore client supplied icon"
-msgstr "Eira kliendi enda ikooni"
+msgstr "Kliendi enda ikooni eiramine"
-#: ../src/winspector.c:1562
+#: ../src/winspector.c:1556
msgid "Initial Workspace"
msgstr "Töölaud, millel käivitatakse"
-#: ../src/winspector.c:1564
+#: ../src/winspector.c:1558
msgid "The workspace to place the window when it'sfirst shown."
msgstr "Töölaua nimi, mille peal akent esimest korda näidatakse."
-#: ../src/winspector.c:1570
+#: ../src/winspector.c:1564
msgid "Nowhere in particular"
msgstr "Ei oma tähtsust"
-#: ../src/winspector.c:1588
+#: ../src/winspector.c:1582
msgid "Application Attributes"
msgstr "Rakenduse rekvisiidid"
-#: ../src/winspector.c:1599
+#: ../src/winspector.c:1593
msgid "Start hidden"
msgstr "Käivita peidetuna"
-#: ../src/winspector.c:1601
+#: ../src/winspector.c:1595
msgid "Automatically hide application when it's started."
-msgstr "Peidab akna programmi käivitamise hetkel."
+msgstr "Akna peitmine rakenduse käivitamise hetkel."
-#: ../src/winspector.c:1604
+#: ../src/winspector.c:1598
msgid "No application icon"
msgstr "Rakenduse ikoon peidus"
-#: ../src/winspector.c:1606
+#: ../src/winspector.c:1600
msgid ""
"Disable the application icon for the application.\n"
"Note that you won't be able to dock it anymore,\n"
"and any icons that are already docked will stop\n"
"working correctly."
msgstr ""
-"Keelab rakenduse ikooni. Keelamise korral ei ole\n"
-"võimalik rakendust dokkida ja kõik selle rakenduse\n"
-"juba dokitud ikoonid ei toimi enam korrektselt."
+"Rakenduse ikooni keelamine. Sel juhul pole\n"
+"rakendust võimalik dokkida ja kõik selle\n"
+"rakenduse juba dokitud ikoonid ei toimi enam\n"
+"korrektselt."
-#: ../src/winspector.c:1612
+#: ../src/winspector.c:1606
msgid "Shared application icon"
msgstr "Rakenduse ikoon jagatud"
-#: ../src/winspector.c:1614
+#: ../src/winspector.c:1608
msgid ""
"Use a single shared application icon for all of\n"
"the instances of this application.\n"
msgstr ""
-"Kasutab ühte jagatud ikooni kõigi\n"
+"Ühe jagatud ikooni kasutamine kõigi\n"
"rakenduse instantside jaoks.\n"
-#: ../src/wmspec.c:277
-msgid "out of memory while updating wm hints"
-msgstr "mälu lõppes wm vihjete uuendamise käigus"
-
-#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:876
+#: ../src/workspace.c:103 ../src/workspace.c:104 ../src/workspace.c:1302
#, c-format
msgid "Workspace %i"
msgstr "Töölaud %i"
-#: ../src/workspace.c:926
+#: ../src/workspace.c:1352
msgid "Workspaces"
msgstr "Töölauad"
-#: ../src/workspace.c:928
+#: ../src/workspace.c:1354
msgid "could not create Workspace menu"
-msgstr "ei õnnestu luua töölaua menüüd"
+msgstr "töölaua menüüd pole võimalik luua"
-#: ../src/workspace.c:935
+#: ../src/workspace.c:1361
msgid "New"
msgstr "Uus"
-#: ../src/workspace.c:936
+#: ../src/workspace.c:1362
msgid "Destroy Last"
msgstr "Eemalda viimane"
+
diff -uhrN WindowMaker-0.92.0/src/actions.c WindowMaker-CVS-20060123/src/actions.c
--- WindowMaker-0.92.0/src/actions.c 2005-07-03 19:25:14.000000000 +0200
+++ WindowMaker-CVS-20060123/src/actions.c 2005-08-23 01:23:41.000000000 +0200
@@ -365,7 +365,8 @@
void
wMaximizeWindow(WWindow *wwin, int directions)
{
- int new_width, new_height, new_x, new_y;
+ int new_x, new_y;
+ unsigned int new_width, new_height;
int changed_h, changed_v, shrink_h, shrink_v;
WArea usableArea, totalArea;
diff -uhrN WindowMaker-0.92.0/src/event.c WindowMaker-CVS-20060123/src/event.c
--- WindowMaker-0.92.0/src/event.c 2005-03-13 01:13:55.000000000 +0100
+++ WindowMaker-CVS-20060123/src/event.c 2005-12-07 20:22:09.000000000 +0100
@@ -559,6 +559,10 @@
wwin->flags.skip_next_animation = 1;
wIconifyWindow(wwin);
}
+ if (wwin->flags.fullscreen) {
+ wwin->flags.fullscreen = 0;
+ wFullscreenWindow(wwin);
+ }
if (wwin->flags.hidden) {
WApplication *wapp = wApplicationOf(wwin->main_window);
diff -uhrN WindowMaker-0.92.0/src/icon.c WindowMaker-CVS-20060123/src/icon.c
--- WindowMaker-0.92.0/src/icon.c 2005-03-11 23:27:58.000000000 +0100
+++ WindowMaker-CVS-20060123/src/icon.c 2005-08-23 00:18:46.000000000 +0200
@@ -651,7 +651,7 @@
if (icon->icon_win!=None) {
XWindowAttributes attr;
int resize=0;
- int width, height, depth;
+ unsigned int width, height, depth;
int theight;
Pixmap pixmap;
diff -uhrN WindowMaker-0.92.0/src/misc.c WindowMaker-CVS-20060123/src/misc.c
--- WindowMaker-0.92.0/src/misc.c 2004-11-11 14:31:47.000000000 +0100
+++ WindowMaker-CVS-20060123/src/misc.c 2005-08-23 00:46:24.000000000 +0200
@@ -1128,7 +1128,7 @@
void
SendHelperMessage(WScreen *scr, char type, int workspace, char *msg)
{
- unsigned char *buffer;
+ char *buffer;
int len;
int i;
char buf[16];
diff -uhrN WindowMaker-0.92.0/src/moveres.c WindowMaker-CVS-20060123/src/moveres.c
--- WindowMaker-0.92.0/src/moveres.c 2004-10-24 21:36:09.000000000 +0200
+++ WindowMaker-CVS-20060123/src/moveres.c 2005-08-23 01:27:24.000000000 +0200
@@ -1471,7 +1471,7 @@
ww=w;wh=h;
wh-=vert_border;
- wWindowConstrainSize(wwin, &ww, &wh);
+ wWindowConstrainSize(wwin, (unsigned int*)&ww, (unsigned int*)&wh);
wh+=vert_border;
if (wPreferences.ws_cycle){
@@ -2070,7 +2070,7 @@
rh += dh;
fw = rw;
fh = rh - vert_border;
- wWindowConstrainSize(wwin, &fw, &fh);
+ wWindowConstrainSize(wwin, (unsigned int*)&fw, (unsigned int*)&fh);
fh += vert_border;
if (res & LEFT)
fx = rx2 - fw + 1;
diff -uhrN WindowMaker-0.92.0/src/properties.c WindowMaker-CVS-20060123/src/properties.c
--- WindowMaker-0.92.0/src/properties.c 2004-10-14 23:11:52.000000000 +0200
+++ WindowMaker-CVS-20060123/src/properties.c 2005-08-23 00:19:58.000000000 +0200
@@ -234,8 +234,8 @@
if (image->format == RRGBAFormat) {
memcpy(&tmp[4], image->data, image->width*image->height*4);
} else {
- char *ptr = tmp+4;
- char *src = image->data;
+ char *ptr = (char*)(tmp+4);
+ char *src = (char*)image->data;
for (y = 0; y < image->height; y++) {
for (x = 0; x < image->width; x++) {
diff -uhrN WindowMaker-0.92.0/src/startup.c WindowMaker-CVS-20060123/src/startup.c
--- WindowMaker-0.92.0/src/startup.c 2005-03-12 02:11:30.000000000 +0100
+++ WindowMaker-CVS-20060123/src/startup.c 2005-08-23 00:20:16.000000000 +0200
@@ -25,6 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
#include <errno.h>
#include <signal.h>
#include <sys/wait.h>
diff -uhrN WindowMaker-0.92.0/src/switchpanel.c WindowMaker-CVS-20060123/src/switchpanel.c
--- WindowMaker-0.92.0/src/switchpanel.c 2004-10-30 09:16:04.000000000 +0200
+++ WindowMaker-CVS-20060123/src/switchpanel.c 2006-01-22 19:08:39.000000000 +0100
@@ -501,6 +501,7 @@
if (!panel->bg) {
WMFrame *frame = WMCreateFrame(panel->win);
+ WMColor *darkGray = WMDarkGrayColor(scr->wmscreen);
WMSetFrameRelief(frame, WRSimple);
WMSetViewExpandsToParent(WMWidgetView(frame), 0, 0, 0, 0);
@@ -508,10 +509,11 @@
WMResizeWidget(panel->label, width, LABEL_HEIGHT);
WMMoveWidget(panel->label, BORDER_SPACE, BORDER_SPACE+ICON_TILE_SIZE+5);
WMSetLabelRelief(panel->label, WRSimple);
- WMSetWidgetBackgroundColor(panel->label, WMDarkGrayColor(scr->wmscreen));
+ WMSetWidgetBackgroundColor(panel->label, darkGray);
WMSetLabelFont(panel->label, panel->font);
WMSetLabelTextColor(panel->label, panel->white);
+ WMReleaseColor(darkGray);
height+= 5;
}
@@ -604,6 +606,8 @@
RReleaseImage(panel->bg);
if (panel->font)
WMReleaseFont(panel->font);
+ if (panel->white)
+ WMReleaseColor(panel->white);
wfree(panel);
}
diff -uhrN WindowMaker-0.92.0/src/window.c WindowMaker-CVS-20060123/src/window.c
--- WindowMaker-0.92.0/src/window.c 2005-07-01 02:56:11.000000000 +0200
+++ WindowMaker-CVS-20060123/src/window.c 2005-08-23 01:20:14.000000000 +0200
@@ -2043,10 +2043,10 @@
*----------------------------------------------------------------------
*/
void
-wWindowConstrainSize(WWindow *wwin, int *nwidth, int *nheight)
+wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nheight)
{
- int width = *nwidth;
- int height = *nheight;
+ int width = (int)*nwidth;
+ int height = (int)*nheight;
int winc = 1;
int hinc = 1;
int minW = 1, minH = 1;
@@ -2143,8 +2143,8 @@
void
-wWindowCropSize(WWindow *wwin, int maxW, int maxH,
- int *width, int *height)
+wWindowCropSize(WWindow *wwin, unsigned int maxW, unsigned int maxH,
+ unsigned int *width, unsigned int *height)
{
int baseW = 0, baseH = 0;
int winc = 1, hinc = 1;
diff -uhrN WindowMaker-0.92.0/src/window.h WindowMaker-CVS-20060123/src/window.h
--- WindowMaker-0.92.0/src/window.h 2005-07-01 02:05:43.000000000 +0200
+++ WindowMaker-CVS-20060123/src/window.h 2005-08-23 01:20:31.000000000 +0200
@@ -388,9 +388,9 @@
void wWindowUnfocus(WWindow *wwin);
void wWindowUpdateName(WWindow *wwin, char *newTitle);
-void wWindowConstrainSize(WWindow *wwin, int *nwidth, int *nheight);
-void wWindowCropSize(WWindow *wwin, int maxw, int maxh,
- int *nwidth, int *nheight);
+void wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nheight);
+void wWindowCropSize(WWindow *wwin, unsigned int maxw, unsigned int maxh,
+ unsigned int *nwidth, unsigned int *nheight);
void wWindowConfigure(WWindow *wwin, int req_x, int req_y,
int req_width, int req_height);
diff -uhrN WindowMaker-0.92.0/src/wmspec.c WindowMaker-CVS-20060123/src/wmspec.c
--- WindowMaker-0.92.0/src/wmspec.c 2005-05-15 18:41:09.000000000 +0200
+++ WindowMaker-CVS-20060123/src/wmspec.c 2006-01-22 18:28:21.000000000 +0100
@@ -35,6 +35,7 @@
#include <X11/Xlib.h>
#include <X11/Xatom.h>
+#include <X11/Xarch.h>
#include <string.h>
#include "WindowMaker.h"
@@ -70,22 +71,22 @@
static Atom net_current_desktop;
static Atom net_desktop_names;
static Atom net_active_window;
-static Atom net_workarea; /* XXX: not xinerama compatible */
+static Atom net_workarea; /* XXX: not xinerama compatible */
static Atom net_supporting_wm_check;
-static Atom net_virtual_roots; /* N/A */
-static Atom net_desktop_layout; /* XXX */
+static Atom net_virtual_roots; /* N/A */
+static Atom net_desktop_layout; /* XXX */
static Atom net_showing_desktop;
/* Other Root Window Messages */
static Atom net_close_window;
-static Atom net_moveresize_window; /* TODO */
-static Atom net_wm_moveresize; /* TODO */
+static Atom net_moveresize_window; /* TODO */
+static Atom net_wm_moveresize; /* TODO */
/* Application Window Properties */
static Atom net_wm_name;
-static Atom net_wm_visible_name; /* TODO (unnecessary?) */
+static Atom net_wm_visible_name; /* TODO (unnecessary?) */
static Atom net_wm_icon_name;
-static Atom net_wm_visible_icon_name; /* TODO (unnecessary?) */
+static Atom net_wm_visible_icon_name; /* TODO (unnecessary?) */
static Atom net_wm_desktop;
static Atom net_wm_window_type;
static Atom net_wm_window_type_desktop;
@@ -97,7 +98,7 @@
static Atom net_wm_window_type_dialog;
static Atom net_wm_window_type_normal;
static Atom net_wm_state;
-static Atom net_wm_state_modal; /* XXX: what is this?!? */
+static Atom net_wm_state_modal; /* XXX: what is this?!? */
static Atom net_wm_state_sticky;
static Atom net_wm_state_maximized_vert;
static Atom net_wm_state_maximized_horz;
@@ -119,15 +120,15 @@
static Atom net_wm_action_fullscreen;
static Atom net_wm_action_change_desktop;
static Atom net_wm_action_close;
-static Atom net_wm_strut; /* XXX: see net_workarea */
-static Atom net_wm_strut_partial; /* TODO: doesn't really fit into the current strut scheme */
-static Atom net_wm_icon_geometry; /* FIXME: should work together with net_wm_handled_icons, gnome-panel-2.2.0.1 doesn't use _NET_WM_HANDLED_ICONS, thus present situation. */
+static Atom net_wm_strut; /* XXX: see net_workarea */
+static Atom net_wm_strut_partial; /* TODO: doesn't really fit into the current strut scheme */
+static Atom net_wm_icon_geometry; /* FIXME: should work together with net_wm_handled_icons, gnome-panel-2.2.0.1 doesn't use _NET_WM_HANDLED_ICONS, thus present situation. */
static Atom net_wm_icon;
-static Atom net_wm_pid; /* TODO */
-static Atom net_wm_handled_icons; /* FIXME: see net_wm_icon_geometry */
+static Atom net_wm_pid; /* TODO */
+static Atom net_wm_handled_icons; /* FIXME: see net_wm_icon_geometry */
/* Window Manager Protocols */
-static Atom net_wm_ping; /* TODO */
+static Atom net_wm_ping; /* TODO */
static Atom utf8_string;
@@ -322,15 +323,15 @@
void
wNETWMUpdateDesktop(WScreen *scr)
{
- CARD32 *views, sizes[2];
+ long *views, sizes[2];
int count, i;
if (scr->workspace_count==0)
return;
count = scr->workspace_count * 2;
- views = wmalloc(sizeof(CARD32) * count);
- /*memset(views, 0, sizeof(CARD32) * count);*/
+ views = wmalloc(sizeof(long) * count);
+ /*memset(views, 0, sizeof(long) * count);*/
#ifdef VIRTUAL_DESKTOP
sizes[0] = scr->workspaces[scr->current_workspace]->width;
@@ -370,7 +371,7 @@
0, 1, &count);
if (prop)
{
- int desktop= *(CARD32*)prop;
+ int desktop= *(long*)prop;
XFree(prop);
return desktop;
}
@@ -389,12 +390,12 @@
*
* The logic can also be changed to accept bigger images and scale them down.
*/
-static CARD32*
-findBestIcon(CARD32 *data, unsigned long items)
+static unsigned long*
+findBestIcon(unsigned long *data, unsigned long items)
{
int size, wanted, d, distance;
unsigned long i;
- CARD32 *icon;
+ unsigned long *icon;
/* better use only 75% of icon_size. For 64x64 this means 48x48
* This leaves room around the icon for the miniwindow title and
@@ -418,12 +419,12 @@
static RImage*
-makeRImageFromARGBData(CARD32 *data)
+makeRImageFromARGBData(unsigned long *data)
{
int size, width, height, i;
RImage *image;
unsigned char *imgdata;
- CARD32 pixel;
+ unsigned long pixel;
width = data[0];
height = data[1];
@@ -436,10 +437,18 @@
for (imgdata=image->data, i=2; i<size+2; i++, imgdata+=4) {
pixel = data[i];
+#if BYTE_ORDER == BIG_ENDIAN
+ imgdata[2] = (pixel >> 24) & 0xff; /* A */
+ imgdata[1] = (pixel >> 16) & 0xff; /* R */
+ imgdata[0] = (pixel >> 8) & 0xff; /* G */
+ imgdata[3] = (pixel >> 0) & 0xff; /* B */
+#else /* Little endian */
imgdata[3] = (pixel >> 24) & 0xff; /* A */
imgdata[0] = (pixel >> 16) & 0xff; /* R */
imgdata[1] = (pixel >> 8) & 0xff; /* G */
imgdata[2] = (pixel >> 0) & 0xff; /* B */
+#endif /* endianness */
+
}
return image;
@@ -449,7 +458,7 @@
static void
updateIconImage(WScreen *scr, WWindow *wwin)
{
- CARD32 *property, *data;
+ unsigned long *property, *data;
unsigned long items, rest;
Atom type;
int format;
@@ -487,7 +496,7 @@
static void
updateShowDesktop(WScreen * scr, Bool show)
{
- CARD32 foo;
+ long foo;
foo = (show == True);
XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,
@@ -660,7 +669,7 @@
void
wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
{
- CARD32 *area;
+ long *area;
int count, i;
/* XXX: not Xinerama compatible,
@@ -670,7 +679,7 @@
return;
count = scr->workspace_count * 4;
- area = wmalloc(sizeof(CARD32) * count);
+ area = wmalloc(sizeof(long) * count);
for (i=0; i<scr->workspace_count; i++) {
area[4*i + 0] = usableArea.x1;
area[4*i + 1] = usableArea.y1;
@@ -793,7 +802,7 @@
static void
updateWorkspaceCount(WScreen *scr) /* changeable */
{
- CARD32 count;
+ long count;
count = scr->workspace_count;
@@ -805,7 +814,7 @@
static void
updateCurrentWorkspace(WScreen *scr) /* changeable */
{
- CARD32 count;
+ long count;
count = scr->current_workspace;
@@ -852,7 +861,7 @@
static void
updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
{
- CARD32 l;
+ long l;
if (del) {
XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);
diff -uhrN WindowMaker-0.92.0/test/wtest.c WindowMaker-CVS-20060123/test/wtest.c
--- WindowMaker-0.92.0/test/wtest.c 2004-10-12 23:03:04.000000000 +0200
+++ WindowMaker-CVS-20060123/test/wtest.c 2005-08-23 00:40:15.000000000 +0200
@@ -15,11 +15,11 @@
#include <X11/Xproto.h>
#include <WMaker.h>
-static unsigned char bits[] = {
+static char bits[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-static unsigned char mbits[] = {
+static char mbits[] = {
0xff, 0x03, 0xff, 0x01, 0xff, 0x00, 0x7f, 0x00, 0x3f, 0x00, 0x1f, 0x00,
0x0f, 0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00};
diff -uhrN WindowMaker-0.92.0/util/wmsetbg.c WindowMaker-CVS-20060123/util/wmsetbg.c
--- WindowMaker-0.92.0/util/wmsetbg.c 2004-10-27 05:01:38.000000000 +0200
+++ WindowMaker-CVS-20060123/util/wmsetbg.c 2005-08-23 00:49:29.000000000 +0200
@@ -787,7 +787,7 @@
freeTexture(BackgroundTexture *texture)
{
if (texture->solid) {
- long pixel[1];
+ unsigned long pixel[1];
pixel[0] = texture->color.pixel;
/* dont free black/white pixels */
@@ -966,7 +966,7 @@
int
-readmsg(int fd, unsigned char *buffer, int size)
+readmsg(int fd, char *buffer, int size)
{
int count;
@@ -998,7 +998,7 @@
{
BackgroundTexture *textures[WORKSPACE_COUNT];
int maxTextures = 0;
- unsigned char buffer[2048], buf[8];
+ char buffer[2048], buf[8];
int size;
int errcount = 4;
diff -uhrN WindowMaker-0.92.0/WINGs/ChangeLog WindowMaker-CVS-20060123/WINGs/ChangeLog
--- WindowMaker-0.92.0/WINGs/ChangeLog 2004-10-23 04:21:59.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/ChangeLog 2006-01-22 21:33:00.000000000 +0100
@@ -1,3 +1,17 @@
+Changes since wmaker 0.92.0:
+............................
+
+- updated the XDND code in to work with GDK based applications.
+ WINGs based applications should now work with both KDE and GNOME
+ applications (Sylvain Reynal <sreynal@nerim.net>)
+- better check for the XDND protocol version when interoperating with other
+ applications. As it seems xdnd version 3 (which WINGs supports) and newer
+ are not backward compatible with xdnd version 1 and 2. This is why WINGs
+ applications cannot interoperate with GNUstep applications (which uses
+ xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
+ version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
+
+
Changes since wmaker 0.80.1:
............................
diff -uhrN WindowMaker-0.92.0/WINGs/connection.c WindowMaker-CVS-20060123/WINGs/connection.c
--- WindowMaker-0.92.0/WINGs/connection.c 2004-10-23 04:46:36.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/connection.c 2005-08-23 00:10:49.000000000 +0200
@@ -201,7 +201,7 @@
if (cPtr->state == WCInProgress) {
Bool failed;
- int len = sizeof(result);
+ socklen_t len = sizeof(result);
WCErrorCode = 0;
if (getsockopt(cPtr->sock, SOL_SOCKET, SO_ERROR,
@@ -462,8 +462,8 @@
{
WMConnection *cPtr;
struct sockaddr_in *socketaddr;
+ socklen_t size;
int sock, on;
- int size;
WCErrorCode = 0;
@@ -678,7 +678,7 @@
WMAcceptConnection(WMConnection *listener)
{
struct sockaddr_in clientname;
- int size;
+ socklen_t size;
int newSock;
WMConnection *newConnection;
diff -uhrN WindowMaker-0.92.0/WINGs/dragcommon.c WindowMaker-CVS-20060123/WINGs/dragcommon.c
--- WindowMaker-0.92.0/WINGs/dragcommon.c 2004-10-28 11:25:23.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/dragcommon.c 2006-01-22 21:15:43.000000000 +0100
@@ -2,11 +2,9 @@
#include "WINGsP.h"
-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion
+#define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
#define XDND_DEST_INFO(dragInfo) dragInfo->destInfo
#define XDND_DEST_VIEW(dragInfo) dragInfo->destInfo->destView
-#define XDND_DEST_VIEW_STORED(dragInfo) ((dragInfo->destInfo) != NULL)\
- && ((dragInfo->destInfo->destView) != NULL)
static Bool _WindowExists;
@@ -151,6 +149,13 @@
{
XEvent ev;
+#ifdef XDND_DEBUG
+ char* msgName = XGetAtomName(dpy, message);
+
+ printf("sending message %s ... ", msgName);
+ XFree(msgName);
+#endif
+
if (! windowExists(dpy, win)) {
wwarning("xdnd message target %d does no longer exist.", win);
return False; /* message not sent */
@@ -170,6 +175,9 @@
XSendEvent(dpy, win, False, 0, &ev);
XFlush(dpy);
+#ifdef XDND_DEBUG
+ printf("sent\n");
+#endif
return True; /* message sent */
}
@@ -178,7 +186,9 @@
handleLeaveMessage(WMDraggingInfo *info)
{
if (XDND_DEST_INFO(info) != NULL) {
- if (XDND_DEST_VIEW(info) != NULL) {
+ /* XDND_DEST_VIEW is never NULL (it's the xdnd aware view) */
+ wassertr(XDND_DEST_VIEW(info) != NULL);
+ if (XDND_DEST_VIEW(info)->dragDestinationProcs != NULL) {
XDND_DEST_VIEW(info)->dragDestinationProcs->concludeDragOperation(
XDND_DEST_VIEW(info));
}
@@ -216,11 +226,15 @@
/* Messages from source to destination */
if (messageType == scr->xdndEnterAtom) {
+ Bool positionSent = (XDND_DEST_INFO(info) != NULL);
+
W_DragDestinationStopTimer();
W_DragDestinationStoreEnterMsgInfo(info, toplevel, event);
- if (VERSION_INFO(info) <= XDND_VERSION) {
- if (XDND_DEST_VIEW_STORED(info)) {
+ /* Xdnd version 3 and up are not compatible with version 1 or 2 */
+ if (XDND_SOURCE_VERSION(info) > 2) {
+
+ if (positionSent) {
/* xdndPosition previously received on xdnd aware view */
W_DragDestinationStateHandler(info, event);
return;
@@ -230,7 +244,7 @@
}
} else {
wwarning("received dnd enter msg with unsupported version %i",
- VERSION_INFO(info));
+ XDND_SOURCE_VERSION(info));
W_DragDestinationCancelDropOnEnter(toplevel, info);
return;
}
diff -uhrN WindowMaker-0.92.0/WINGs/dragdestination.c WindowMaker-CVS-20060123/WINGs/dragdestination.c
--- WindowMaker-0.92.0/WINGs/dragdestination.c 2004-10-28 11:25:36.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/dragdestination.c 2006-01-22 21:19:18.000000000 +0100
@@ -5,15 +5,16 @@
#define XDND_SOURCE_RESPONSE_MAX_DELAY 3000
-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion
-
#define XDND_PROPERTY_FORMAT 32
#define XDND_ACTION_DESCRIPTION_FORMAT 8
+#define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
#define XDND_DEST_INFO(dragInfo) dragInfo->destInfo
+#define XDND_AWARE_VIEW(dragInfo) dragInfo->destInfo->xdndAwareView
#define XDND_SOURCE_WIN(dragInfo) dragInfo->destInfo->sourceWindow
#define XDND_DEST_VIEW(dragInfo) dragInfo->destInfo->destView
#define XDND_DEST_STATE(dragInfo) dragInfo->destInfo->state
+#define XDND_SOURCE_ACTION_CHANGED(dragInfo) dragInfo->destInfo->sourceActionChanged
#define XDND_SOURCE_TYPES(dragInfo) dragInfo->destInfo->sourceTypes
#define XDND_TYPE_LIST_AVAILABLE(dragInfo) dragInfo->destInfo->typeListAvailable
#define XDND_REQUIRED_TYPES(dragInfo) dragInfo->destInfo->requiredTypes
@@ -22,8 +23,8 @@
#define XDND_SOURCE_OPERATIONS(dragInfo) dragInfo->destInfo->sourceOperations
#define XDND_DROP_DATAS(dragInfo) dragInfo->destInfo->dropDatas
#define XDND_DROP_DATA_COUNT(dragInfo) dragInfo->destInfo->dropDataCount
-#define XDND_DEST_VIEW_STORED(dragInfo) ((dragInfo->destInfo) != NULL)\
- && ((dragInfo->destInfo->destView) != NULL)
+#define XDND_DEST_VIEW_IS_REGISTERED(dragInfo) ((dragInfo->destInfo) != NULL)\
+ && ((dragInfo->destInfo->destView->dragDestinationProcs) != NULL)
static unsigned char XDNDversion = XDND_VERSION;
@@ -81,7 +82,6 @@
static WMArray*
getTypesFromTypeList(WMScreen *scr, Window sourceWin)
{
- /* // WMDraggingInfo *info = &scr->dragInfo;*/
Atom dataType;
Atom* typeAtomList;
WMArray* typeList;
@@ -138,22 +138,29 @@
WMScreen *scr = W_VIEW_SCREEN(destView);
WMArray *requiredTypes;
- /* First, see if the 3 source types are enough for dest requirements */
+ /* First, see if the stored source types are enough for dest requirements */
requiredTypes = destView->dragDestinationProcs->requiredDataTypes(
destView,
W_ActionToOperation(scr, XDND_SOURCE_ACTION(info)),
XDND_SOURCE_TYPES(info));
if (requiredTypes == NULL && XDND_TYPE_LIST_AVAILABLE(info)) {
- /* None of the 3 source types fits, get the whole type list */
+ /* None of the stored source types fits, but the whole type list
+ hasn't been retrieved yet. */
+ WMFreeArray(XDND_SOURCE_TYPES(info));
+ XDND_SOURCE_TYPES(info) = getTypesFromTypeList(
+ scr,
+ XDND_SOURCE_WIN(info));
+ /* Don't retrieve the type list again */
+ XDND_TYPE_LIST_AVAILABLE(info) = False;
+
requiredTypes =
destView->dragDestinationProcs->requiredDataTypes(
destView,
W_ActionToOperation(scr, XDND_SOURCE_ACTION(info)),
- getTypesFromTypeList(scr, XDND_SOURCE_WIN(info)));
+ XDND_SOURCE_TYPES(info));
}
-
XDND_REQUIRED_TYPES(info) = requiredTypes;
}
@@ -219,7 +226,7 @@
}
operationArray = WMCreateDragOperationArray(count);
- description = descriptionList;
+ description = (char*)descriptionList;
for (i=0; count > 0; i++) {
size = strlen(description);
@@ -249,47 +256,35 @@
}
-static Window
-findChildInWindow(Display *dpy, Window toplevel, int x, int y)
+static WMView*
+findChildInView(WMView* parent, int x, int y)
{
- Window foo, bar;
- Window *children;
- unsigned nchildren;
- int i;
+ if (parent->childrenList == NULL)
+ return parent;
+ else {
+ WMView* child = parent->childrenList;
- if (!XQueryTree(dpy, toplevel, &foo, &bar,
- &children, &nchildren) || children == NULL) {
- return None;
- }
-
- /* first window that contains the point is the one */
- for (i = nchildren-1; i >= 0; i--) {
- XWindowAttributes attr;
-
- if (XGetWindowAttributes(dpy, children[i], &attr)
- && attr.map_state == IsViewable
- && x >= attr.x && y >= attr.y
- && x < attr.x + attr.width && y < attr.y + attr.height) {
- Window child, tmp;
-
- tmp = children[i];
- child = findChildInWindow(dpy, tmp, x - attr.x, y - attr.y);
- XFree(children);
-
- if (child == None)
- return tmp;
- else
- return child;
- }
+ while (child != NULL
+ && (! child->flags.mapped
+ || x < WMGetViewPosition(child).x
+ || x > WMGetViewPosition(child).x + WMGetViewSize(child).width
+ || y < WMGetViewPosition(child).y
+ || y > WMGetViewPosition(child).y + WMGetViewSize(child).height))
+
+ child = child->nextSister;
+
+ if (child == NULL)
+ return parent;
+ else
+ return findChildInView(child,
+ x - WMGetViewPosition(child).x,
+ y - WMGetViewPosition(child).y);
}
-
- XFree(children);
- return None;
}
static WMView*
-findXdndViewInToplevel(WMView* toplevel, int x, int y)
+findDestinationViewInToplevel(WMView* toplevel, int x, int y)
{
WMScreen *scr = W_VIEW_SCREEN(toplevel);
Window toplevelWin = WMViewXID(toplevel);
@@ -300,20 +295,7 @@
XTranslateCoordinates(scr->display, scr->rootWin, toplevelWin,
x, y, &xInToplevel, &yInToplevel,
&foo);
-
- child = findChildInWindow(scr->display, toplevelWin,
- xInToplevel, yInToplevel);
-
- if (child != None) {
- childView = W_GetViewForXWindow(scr->display, child);
-
- /* if childView supports Xdnd, return childView */
- if (childView != NULL
- && childView->dragDestinationProcs != NULL)
- return childView;
- }
-
- return NULL;
+ return findChildInView(toplevel, xInToplevel, yInToplevel);
}
@@ -334,6 +316,7 @@
XDND_REQUIRED_TYPES(info) = NULL;
}
+
void
W_DragDestinationInfoClear(WMDraggingInfo *info)
{
@@ -347,15 +330,19 @@
}
}
+
static void
-initDestinationDragInfo(WMDraggingInfo *info)
+initDestinationDragInfo(WMDraggingInfo *info, WMView *destView)
{
+ wassertr(destView != NULL);
+
XDND_DEST_INFO(info) =
(W_DragDestinationInfo*) wmalloc(sizeof(W_DragDestinationInfo));
XDND_DEST_STATE(info) = idleState;
- XDND_DEST_VIEW(info) = NULL;
+ XDND_DEST_VIEW(info) = destView;
+ XDND_SOURCE_ACTION_CHANGED(info) = False;
XDND_SOURCE_TYPES(info) = NULL;
XDND_REQUIRED_TYPES(info) = NULL;
XDND_DROP_DATAS(info) = NULL;
@@ -369,13 +356,19 @@
WMScreen *scr = W_VIEW_SCREEN(toplevel);
if (XDND_DEST_INFO(info) == NULL)
- initDestinationDragInfo(info);
+ initDestinationDragInfo(info, toplevel);
+ XDND_SOURCE_VERSION(info) = (event->data.l[1] >> 24);
+ XDND_AWARE_VIEW(info) = toplevel;
updateSourceWindow(info, event);
- /* store xdnd version for source */
- info->protocolVersion = (event->data.l[1] >> 24);
-
+/*
+ if (event->data.l[1] & 1)
+ /* XdndTypeList property is available */
+/* XDND_SOURCE_TYPES(info) = getTypesFromTypeList(scr, XDND_SOURCE_WIN(info));
+ else
+ XDND_SOURCE_TYPES(info) = getTypesFromThreeTypes(scr, event);
+*/
XDND_SOURCE_TYPES(info) = getTypesFromThreeTypes(scr, event);
/* to use if the 3 types are not enough */
@@ -383,45 +376,30 @@
}
-static void
-cancelDrop(WMView *destView, WMDraggingInfo *info);
-
-static void
-suspendDropAuthorization(WMView *destView, WMDraggingInfo *info);
-
-
void
- W_DragDestinationStorePositionMsgInfo(WMDraggingInfo *info,
- WMView *toplevel, XClientMessageEvent *event)
+W_DragDestinationStorePositionMsgInfo(WMDraggingInfo *info,
+ WMView *toplevel, XClientMessageEvent *event)
{
int x = event->data.l[2] >> 16;
int y = event->data.l[2] & 0xffff;
- WMView *oldDestView;
WMView *newDestView;
- newDestView = findXdndViewInToplevel(toplevel, x, y);
+ newDestView = findDestinationViewInToplevel(toplevel, x, y);
if (XDND_DEST_INFO(info) == NULL) {
- initDestinationDragInfo(info);
+ initDestinationDragInfo(info, newDestView);
+ XDND_AWARE_VIEW(info) = toplevel;
updateSourceWindow(info, event);
- XDND_DEST_VIEW(info) = newDestView;
- }
- else {
- oldDestView = XDND_DEST_VIEW(info);
-
- if (newDestView != oldDestView) {
- if (oldDestView != NULL) {
- suspendDropAuthorization(oldDestView, info);
- XDND_DEST_STATE(info) = dropNotAllowedState;
- }
-
+ } else {
+ if (newDestView != XDND_DEST_VIEW(info)) {
updateSourceWindow(info, event);
XDND_DEST_VIEW(info) = newDestView;
+ XDND_SOURCE_ACTION_CHANGED(info) = False;
- if (newDestView != NULL) {
- if (XDND_DEST_STATE(info) != waitEnterState)
- XDND_DEST_STATE(info) = idleState;
- }
+ if (XDND_DEST_STATE(info) != waitEnterState)
+ XDND_DEST_STATE(info) = idleState;
+ } else {
+ XDND_SOURCE_ACTION_CHANGED(info) = (XDND_SOURCE_ACTION(info) != event->data.l[4]);
}
}
@@ -437,27 +415,62 @@
/* send a DnD message to the source window */
static void
-sendDnDClientMessage(WMView *destView, Atom message,
+sendDnDClientMessage(WMDraggingInfo *info, Atom message,
unsigned long data1,
unsigned long data2,
unsigned long data3,
unsigned long data4)
{
- WMScreen *scr = W_VIEW_SCREEN(destView);
- WMDraggingInfo *info = &scr->dragInfo;
+ if (! W_SendDnDClientMessage(W_VIEW_SCREEN(XDND_AWARE_VIEW(info))->display,
+ XDND_SOURCE_WIN(info),
+ message,
+ WMViewXID(XDND_AWARE_VIEW(info)),
+ data1,
+ data2,
+ data3,
+ data4)) {
+ /* drop failed */
+ W_DragDestinationInfoClear(info);
+ }
+}
- if (XDND_DEST_INFO(info) != NULL) {
- if (! W_SendDnDClientMessage(scr->display,
- XDND_SOURCE_WIN(info),
- message,
- WMViewXID(destView),
- data1,
- data2,
- data3,
- data4)) {
- /* drop failed */
- W_DragDestinationInfoClear(info);
- }
+
+/* send a xdndStatus message to the source, with position and size
+ of the destination if it has no subwidget (requesting a position message
+ on every move otherwise) */
+static void
+sendStatusMessage(WMView *destView, WMDraggingInfo *info, Atom action)
+{
+ unsigned long data1;
+
+ data1 = (action == None) ? 0 : 1;
+
+ if (destView->childrenList == NULL) {
+ WMScreen *scr = W_VIEW_SCREEN(destView);
+ int destX, destY;
+ WMSize destSize = WMGetViewSize(destView);
+ Window foo;
+
+ XTranslateCoordinates(scr->display, WMViewXID(destView), scr->rootWin,
+ 0, 0, &destX, &destY,
+ &foo);
+
+ sendDnDClientMessage(info,
+ W_VIEW_SCREEN(destView)->xdndStatusAtom,
+ data1,
+ (destX << 16)|destY,
+ (destSize.width << 16)|destSize.height,
+ action);
+ } else {
+ /* set bit 1 to request explicitly position message on every move */
+ data1 = data1 | 2;
+
+ sendDnDClientMessage(info,
+ W_VIEW_SCREEN(destView)->xdndStatusAtom,
+ data1,
+ 0,
+ 0,
+ action);
}
}
@@ -534,31 +547,26 @@
static void
cancelDrop(WMView *destView, WMDraggingInfo *info)
{
- /* send XdndStatus with action None */
- sendDnDClientMessage(destView,
- W_VIEW_SCREEN(destView)->xdndStatusAtom,
- 0, 0, 0, None);
+ sendStatusMessage(destView, info, None);
concludeDrop(destView);
freeDestinationViewInfos(info);
}
-/* suspend drop, when dragged icon enter an unaware subview of destView */
+/* suspend drop, when dragged icon enter an unregistered view
+ or a register view that doesn't accept the drop */
static void
suspendDropAuthorization(WMView *destView, WMDraggingInfo *info)
{
- /* free datas that depend on destination behaviour */
- /* (in short: only keep source's types) */
+ sendStatusMessage(destView, info, None);
+
+ /* Free datas that depend on destination behaviour */
if (XDND_DROP_DATAS(info) != NULL) {
WMFreeArray(XDND_DROP_DATAS(info));
XDND_DROP_DATAS(info) = NULL;
}
- XDND_REQUIRED_TYPES(info) = NULL;
- /* send XdndStatus with action None */
- sendDnDClientMessage(destView,
- W_VIEW_SCREEN(destView)->xdndStatusAtom,
- 0, 0, 0, None);
+ XDND_REQUIRED_TYPES(info) = NULL;
}
@@ -566,14 +574,10 @@
void
W_DragDestinationCancelDropOnEnter(WMView *toplevel, WMDraggingInfo *info)
{
- if (XDND_DEST_VIEW_STORED(info))
+ if (XDND_DEST_VIEW_IS_REGISTERED(info))
cancelDrop(XDND_DEST_VIEW(info), info);
- else {
- /* send XdndStatus with action None */
- sendDnDClientMessage(toplevel,
- W_VIEW_SCREEN(toplevel)->xdndStatusAtom,
- 0, 0, 0, None);
- }
+ else
+ sendStatusMessage(toplevel, info, None);
W_DragDestinationInfoClear(info);
}
@@ -582,7 +586,7 @@
static void
finishDrop(WMView *destView, WMDraggingInfo *info)
{
- sendDnDClientMessage(destView,
+ sendDnDClientMessage(info,
W_VIEW_SCREEN(destView)->xdndFinishedAtom,
0, 0, 0, 0);
concludeDrop(destView);
@@ -603,31 +607,6 @@
}
-/* send the action that can be performed,
- and the limits outside wich the source must re-send
- its position and action */
-static void
-sendAllowedAction(WMView *destView, Atom action)
-{
- WMScreen *scr = W_VIEW_SCREEN(destView);
- /* // WMPoint destPos = WMGetViewScreenPosition(destView); */
- WMSize destSize = WMGetViewSize(destView);
- int destX, destY;
- Window foo;
-
- XTranslateCoordinates(scr->display, scr->rootWin, WMViewXID(destView),
- 0, 0, &destX, &destY,
- &foo);
-
- sendDnDClientMessage(destView,
- scr->xdndStatusAtom,
- 1,
- (destX << 16)|destY,
- (destSize.width << 16)|destSize.height,
- action);
-}
-
-
static void*
checkActionAllowed(WMView *destView, WMDraggingInfo* info)
{
@@ -639,10 +618,11 @@
return dropNotAllowedState;
}
- sendAllowedAction(destView, XDND_DEST_ACTION(info));
+ sendStatusMessage(destView, info, XDND_DEST_ACTION(info));
return dropAllowedState;
}
+
static void*
checkDropAllowed(WMView *destView, XClientMessageEvent *event,
WMDraggingInfo* info)
@@ -670,6 +650,7 @@
return checkActionAllowed(destView, info);
}
+
static WMPoint*
getDropLocationInView(WMView *view)
{
@@ -690,6 +671,7 @@
return location;
}
+
static void
callPerformDragOperation(WMView *destView, WMDraggingInfo *info)
{
@@ -721,21 +703,17 @@
WMDraggingInfo *info;
wwarning("delay for drag source response expired");
- if (view != NULL) {
- info = &(W_VIEW_SCREEN(view)->dragInfo);
- if (XDND_DEST_VIEW_STORED(info))
- cancelDrop(view, info);
- else {
- /* send XdndStatus with action None */
- sendDnDClientMessage(view,
- W_VIEW_SCREEN(view)->xdndStatusAtom,
- 0, 0, 0, None);
- }
-
- W_DragDestinationInfoClear(info);
+ info = &(W_VIEW_SCREEN(view)->dragInfo);
+ if (XDND_DEST_VIEW_IS_REGISTERED(info))
+ cancelDrop(view, info);
+ else {
+ sendStatusMessage(view, info, None);
}
+
+ W_DragDestinationInfoClear(info);
}
+
void
W_DragDestinationStopTimer()
{
@@ -745,21 +723,17 @@
}
}
+
void
W_DragDestinationStartTimer(WMDraggingInfo *info)
{
W_DragDestinationStopTimer();
- if (XDND_DEST_STATE(info) != idleState
- || XDND_DEST_VIEW(info) == NULL) {
- /* note: info->destView == NULL means :
- Enter message has been received, waiting for Position message */
-
+ if (XDND_DEST_STATE(info) != idleState)
dndDestinationTimer = WMAddTimerHandler(
XDND_SOURCE_RESPONSE_MAX_DELAY,
dragSourceResponseTimeOut,
XDND_DEST_VIEW(info));
- }
}
/* ----- End of Destination timer ----- */
@@ -795,6 +769,7 @@
}
#endif
+
static void*
idleState(WMView *destView, XClientMessageEvent *event,
WMDraggingInfo *info)
@@ -802,21 +777,24 @@
WMScreen *scr;
Atom sourceMsg;
- scr = W_VIEW_SCREEN(destView);
- sourceMsg = event->message_type;
-
- if (sourceMsg == scr->xdndPositionAtom) {
- destView->dragDestinationProcs->prepareForDragOperation(destView);
+ if (destView->dragDestinationProcs != NULL) {
+ scr = W_VIEW_SCREEN(destView);
+ sourceMsg = event->message_type;
+
+ if (sourceMsg == scr->xdndPositionAtom) {
+ destView->dragDestinationProcs->prepareForDragOperation(destView);
+
+ if (XDND_SOURCE_TYPES(info) != NULL) {
+ /* enter message infos are available */
+ return checkDropAllowed(destView, event, info);
+ }
- if (XDND_SOURCE_TYPES(info) != NULL) {
- /* enter message infos are available */
- return checkDropAllowed(destView, event, info);
+ /* waiting for enter message */
+ return waitEnterState;
}
-
- /* waiting for enter message */
- return waitEnterState;
}
+ suspendDropAuthorization(destView, info);
return idleState;
}
@@ -881,6 +859,15 @@
return idleState;
}
+ if (sourceMsg == scr->xdndPositionAtom) {
+ if (XDND_SOURCE_ACTION_CHANGED(info)) {
+ return checkDropAllowed(destView, event, info);
+ } else {
+ sendStatusMessage(destView, info, None);
+ return dropNotAllowedState;
+ }
+ }
+
return dropNotAllowedState;
}
@@ -912,6 +899,15 @@
return idleState;
}
+ if (sourceMsg == scr->xdndPositionAtom) {
+ if (XDND_SOURCE_ACTION_CHANGED(info)) {
+ return checkDropAllowed(destView, event, info);
+ } else {
+ sendStatusMessage(destView, info, XDND_DEST_ACTION(info));
+ return dropAllowedState;
+ }
+ }
+
return dropAllowedState;
}
@@ -947,29 +943,30 @@
WMView *destView;
W_DndState* newState;
- if (XDND_DEST_VIEW_STORED(info)) {
- destView = XDND_DEST_VIEW(info);
- if (XDND_DEST_STATE(info) == NULL)
- XDND_DEST_STATE(info) = idleState;
+ wassertr(XDND_DEST_INFO(info) != NULL);
+ wassertr(XDND_DEST_VIEW(info) != NULL);
+
+ destView = XDND_DEST_VIEW(info);
+ if (XDND_DEST_STATE(info) == NULL)
+ XDND_DEST_STATE(info) = idleState;
#ifdef XDND_DEBUG
- printf("current dest state: %s\n",
- stateName(XDND_DEST_STATE(info)));
+ printf("current dest state: %s\n",
+ stateName(XDND_DEST_STATE(info)));
#endif
- newState = (W_DndState*) XDND_DEST_STATE(info)(destView, event, info);
+ newState = (W_DndState*) XDND_DEST_STATE(info)(destView, event, info);
#ifdef XDND_DEBUG
- printf("new dest state: %s\n", stateName(newState));
+ printf("new dest state: %s\n", stateName(newState));
#endif
- if (XDND_DEST_INFO(info) != NULL) {
- XDND_DEST_STATE(info) = newState;
- if (XDND_DEST_STATE(info) != idleState)
- W_DragDestinationStartTimer(info);
- }
+ if (XDND_DEST_INFO(info) != NULL) {
+ XDND_DEST_STATE(info) = newState;
+ if (XDND_DEST_STATE(info) != idleState)
+ W_DragDestinationStartTimer(info);
}
}
@@ -1104,7 +1101,7 @@
Process drop
dropDatas: datas (WMData*) required by destination (self)
(given in same order as returned by requiredDataTypes).
- A NULL data means it couldn't be retrivied.
+ A NULL data means it couldn't be retrieved.
Destroyed when drop ends.
operationList: if source operation is WDOperationAsk, contains
operations (and associated texts) that can be asked
diff -uhrN WindowMaker-0.92.0/WINGs/dragsource.c WindowMaker-CVS-20060123/WINGs/dragsource.c
--- WindowMaker-0.92.0/WINGs/dragsource.c 2004-10-28 11:29:59.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/dragsource.c 2006-01-22 21:19:36.000000000 +0100
@@ -16,10 +16,10 @@
#define MIN_Y_MOVE_OFFSET 5
#define MAX_SLIDEBACK_ITER 15
-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion
#define XDND_PROPERTY_FORMAT 32
#define XDND_ACTION_DESCRIPTION_FORMAT 8
+#define XDND_DEST_VERSION(dragInfo) dragInfo->protocolVersion
#define XDND_SOURCE_INFO(dragInfo) dragInfo->sourceInfo
#define XDND_DEST_WIN(dragInfo) dragInfo->sourceInfo->destinationWindow
#define XDND_SOURCE_ACTION(dragInfo) dragInfo->sourceAction
@@ -415,21 +415,25 @@
sendEnterMessage(WMDraggingInfo *info)
{
WMScreen *scr = sourceScreen(info);
- unsigned long data1;
+ unsigned long version;
- data1 = (VERSION_INFO(info) << 24)|1; /* 1: support of type list */
+ if (XDND_DEST_VERSION(info) > 2) {
+ if (XDND_DEST_VERSION(info) < XDND_VERSION)
+ version = XDND_DEST_VERSION(info);
+ else
+ version = XDND_VERSION;
+ } else {
+ version = 3;
+ }
return sendDnDClientMessage(info, scr->xdndEnterAtom,
- data1,
+ (version << 24) | 1, /* 1: support of type list */
XDND_3_TYPES(info)[0],
XDND_3_TYPES(info)[1],
XDND_3_TYPES(info)[2]);
}
-/*
-// this functon doesn't return something in all cases.
-// control reaches end of non-void function. fix this -Dan */
static Bool
sendPositionMessage(WMDraggingInfo *info, WMPoint *mousePos)
{
@@ -440,7 +444,7 @@
if (mousePos->x < noPosZone->pos.x
|| mousePos->x > (noPosZone->pos.x + noPosZone->size.width)
|| mousePos->y < noPosZone->pos.y
- || mousePos->y > (noPosZone->pos.y + noPosZone->size.width)) {
+ || mousePos->y > (noPosZone->pos.y + noPosZone->size.height)) {
/* send position if out of zone defined by destination */
return sendDnDClientMessage(info, scr->xdndPositionAtom,
0,
@@ -448,14 +452,18 @@
XDND_TIMESTAMP(info),
XDND_SOURCE_ACTION(info));
}
- } else {
- /* send position on each move */
- return sendDnDClientMessage(info, scr->xdndPositionAtom,
- 0,
- mousePos->x<<16|mousePos->y,
- XDND_TIMESTAMP(info),
- XDND_SOURCE_ACTION(info));
+
+ /* Nothing to send, always succeed */
+ return True;
+
}
+
+ /* send position on each move */
+ return sendDnDClientMessage(info, scr->xdndPositionAtom,
+ 0,
+ mousePos->x<<16|mousePos->y,
+ XDND_TIMESTAMP(info),
+ XDND_SOURCE_ACTION(info));
}
@@ -846,6 +854,30 @@
static void
+storeDestinationProtocolVersion(WMDraggingInfo *info)
+{
+ Atom type;
+ int format;
+ unsigned long count, remain;
+ unsigned char *winXdndVersion;
+ WMScreen *scr = W_VIEW_SCREEN(XDND_SOURCE_VIEW(info));
+
+ wassertr(XDND_DEST_WIN(info) != None);
+
+ if (XGetWindowProperty(scr->display, XDND_DEST_WIN(info),
+ scr->xdndAwareAtom,
+ 0, 1, False, XA_ATOM, &type, &format,
+ &count, &remain, &winXdndVersion) == Success) {
+ XDND_DEST_VERSION(info) = *winXdndVersion;
+ XFree(winXdndVersion);
+ } else {
+ XDND_DEST_VERSION(info) = 0;
+ wwarning("failed to read XDND version of drop target");
+ }
+}
+
+
+static void
initMotionProcess(WMView *view, WMDraggingInfo *info,
XEvent *event, WMPoint *startLocation)
{
@@ -878,9 +910,8 @@
static void
-processMotion(WMDraggingInfo *info, Window windowUnderDrag, WMPoint *mousePos)
+processMotion(WMDraggingInfo *info, WMPoint *mousePos)
{
- /* // WMScreen *scr = sourceScreen(info); */
Window newDestination = findDestination(info, mousePos);
W_DragSourceStopTimer();
@@ -894,20 +925,24 @@
}
XDND_DEST_WIN(info) = newDestination;
- XDND_SOURCE_STATE(info) = idleState;
XDND_DEST_ACTION(info) = None;
XDND_NO_POS_ZONE(info).size.width = 0;
XDND_NO_POS_ZONE(info).size.height = 0;
if (newDestination != None) {
/* entering a xdnd window */
+ XDND_SOURCE_STATE(info) = idleState;
+ storeDestinationProtocolVersion(info);
+
if (! sendEnterMessage(info)) {
XDND_DEST_WIN(info) = None;
return;
}
W_DragSourceStartTimer(info);
- }
+ } else {
+ XDND_SOURCE_STATE(info) = NULL;
+ }
} else {
if (XDND_DEST_WIN(info) != None) {
if (! sendPositionMessage(info, mousePos)) {
@@ -1010,9 +1045,7 @@
mouseLocation.y - XDND_MOUSE_OFFSET(info).y;
refreshDragImage(view, info);
- processMotion(info,
- event->xmotion.window,
- &mouseLocation);
+ processMotion(info, &mouseLocation);
}
}
}
@@ -1041,7 +1074,7 @@
printf("Xdnd status message:\n");
if (statusEvent->data.l[1] & 0x2UL)
- printf("send position on every move\n");
+ printf("\tsend position on every move\n");
else {
int x, y, w, h;
x = statusEvent->data.l[2] >> 16;
@@ -1049,15 +1082,15 @@
w = statusEvent->data.l[3] >> 16;
h = statusEvent->data.l[3] & 0xFFFFL;
- printf("send position out of ((%d,%d) , (%d,%d))\n",
+ printf("\tsend position out of ((%d,%d) , (%d,%d))\n",
x, y, x+w, y+h);
}
if (statusEvent->data.l[1] & 0x1L)
- printf("allowed action: %s\n",
+ printf("\tallowed action: %s\n",
XGetAtomName(dpy, statusEvent->data.l[4]));
else
- printf("no action allowed\n");
+ printf("\tno action allowed\n");
}
#endif
@@ -1231,23 +1264,28 @@
W_DndState* newState;
if (XDND_SOURCE_VIEW_STORED(info)) {
- view = XDND_SOURCE_VIEW(info);
+ if (XDND_SOURCE_STATE(info) != NULL) {
+ view = XDND_SOURCE_VIEW(info);
#ifdef XDND_DEBUG
- printf("current source state: %s\n",
- stateName(XDND_SOURCE_STATE(info)));
+ printf("current source state: %s\n",
+ stateName(XDND_SOURCE_STATE(info)));
#endif
- newState = (W_DndState*) XDND_SOURCE_STATE(info)(view, event, info);
+ newState = (W_DndState*) XDND_SOURCE_STATE(info)(view, event, info);
#ifdef XDND_DEBUG
- printf("new source state: %s\n", stateName(newState));
+ printf("new source state: %s\n", stateName(newState));
#endif
- if (newState != NULL)
- XDND_SOURCE_STATE(info) = newState;
- /* else drop finished, and info has been flushed */
+ if (newState != NULL)
+ XDND_SOURCE_STATE(info) = newState;
+ /* else drop finished, and info has been flushed */
+ }
+
+ } else {
+ wwarning("received DnD message without having a target");
}
}
diff -uhrN WindowMaker-0.92.0/WINGs/Examples/server.c WindowMaker-CVS-20060123/WINGs/Examples/server.c
--- WindowMaker-0.92.0/WINGs/Examples/server.c 2004-10-12 21:31:51.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/Examples/server.c 2005-08-23 00:16:13.000000000 +0200
@@ -126,8 +126,8 @@
}
-static unsigned char*
-findDelimiter(unsigned char *data, unsigned const char *endPtr)
+static char*
+findDelimiter(char *data, const char *endPtr)
{
wassertrv(data < endPtr, NULL);
diff -uhrN WindowMaker-0.92.0/WINGs/Makefile.am WindowMaker-CVS-20060123/WINGs/Makefile.am
--- WindowMaker-0.92.0/WINGs/Makefile.am 2004-10-30 07:44:13.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/Makefile.am 2005-07-17 20:27:58.000000000 +0200
@@ -108,12 +108,12 @@
wutil.c
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" -DDEBUG
AM_CFLAGS = @NOSTRICTALIASING@
INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
- -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
+ @XFTFLAGS@ @HEADER_SEARCH_PATH@
wcolorpanel.o: wcolorpanel.c
diff -uhrN WindowMaker-0.92.0/WINGs/Makefile.in WindowMaker-CVS-20060123/WINGs/Makefile.in
--- WindowMaker-0.92.0/WINGs/Makefile.in 2005-06-19 05:23:00.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/Makefile.in 2006-01-22 21:33:53.000000000 +0100
@@ -134,11 +134,11 @@
libWUtil_a_SOURCES = array.c bagtree.c connection.c data.c error.c findfile.c handlers.c hashtable.c host.c international.c memory.c misc.c notification.c proplist.c snprintf.c string.c tree.c userdefaults.c usleep.c wapplication.c wconfig.h wutil.c
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" -DDEBUG
AM_CFLAGS = @NOSTRICTALIASING@
-INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
+INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src @XFTFLAGS@ @HEADER_SEARCH_PATH@
DISTCLEANFILES = WINGs.pc
diff -uhrN WindowMaker-0.92.0/WINGs/po/de.po WindowMaker-CVS-20060123/WINGs/po/de.po
--- WindowMaker-0.92.0/WINGs/po/de.po 2005-07-03 02:45:48.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/po/de.po 2005-07-05 21:39:14.000000000 +0200
@@ -1,23 +1,28 @@
-# KTranslator Generated File
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+# German Message Catalog for WINGs
+#
+# Initial translation
+# Gudio Scholz <guido.scholz@bayernline.de>
+#
+# Adapted to versions 0.80 ff.
+# Torsten Marek <shlomme@gmx.net>
+#
+
msgid ""
msgstr ""
-"Project-Id-Version: WINGs 0.80.0\n"
-"POT-Creation-Date: 2002-01-09 21:06+0100\n"
-"PO-Revision-Date: 2002-01-09 21:20+0100\n"
-"Last-Translator: Guido Scholz <guido.scholz@bayernline.de>\n"
-"Language-Team: Deutsch <de@li.org>\n"
+"Project-Id-Version: WINGs\n"
+"POT-Creation-Date: 2004-11-01 16:24+0100\n"
+"PO-Revision-Date: 2004-11-05 23:48+0100\n"
+"Last-Translator: shlomme@gmx.net\n"
+"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: unknown\n"
+"Content-Transfer-Encoding: 8bit\n"
-#: ../../WINGs/connection.c:461 ../../WINGs/connection.c:526
-#: ../../WINGs/connection.c:569
+#: ../../WINGs/connection.c:471 ../../WINGs/connection.c:536
+#: ../../WINGs/connection.c:579
msgid "Bad address-service-protocol combination"
-msgstr "Ungültige Adress-Dienst-Protokoll Kombination"
+msgstr "Ungültige Kombination von Adresse und Dienstprotokoll"
#: ../../WINGs/error.c:54
#, c-format
@@ -44,346 +49,349 @@
#: ../../WINGs/findfile.c:48
#, c-format
msgid "could not get password entry for UID %i"
-msgstr "konnte Passwort nicht ermitteln für UID %i"
+msgstr "Passworteintrag für UID %i konnte nicht ermittelt werden"
#: ../../WINGs/findfile.c:66
#, c-format
msgid "could not get password entry for user %s"
-msgstr "konnte Passwort nicht ermitteln für Benutzer %s"
+msgstr "Passworteintrag für Benutzer %s konnte nicht ermittelt werden"
#: ../../WINGs/host.c:114
msgid "Cannot get current host name"
-msgstr "Kann aktuellen Hostnamen nicht ermitteln"
+msgstr "Aktueller Hostname kann nicht ermittelt werden"
+
+#: ../../WINGs/proplist.c:91
+#, c-format
+msgid "syntax error in %s %s, line %i: %s"
+msgstr "Syntaxfehler in %s %s, Zeile %i: %s"
#: ../../WINGs/proplist.c:150
msgid "Only string or data is supported for a proplist dictionary key"
msgstr ""
-"Nur string oder data wird als Schlüssel für ein proplist dictionary "
+"Nur Zeichenketten oder Binärdaten werden als Schlüssel für ein PropList-Dictionary "
"unterstützt"
#: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
#: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
-#: ../../WINGs/proplist.c:1071 ../../WINGs/proplist.c:1123
-#: ../../WINGs/proplist.c:1289 ../../WINGs/proplist.c:1368
-#: ../../WINGs/proplist.c:1489 ../../WINGs/proplist.c:1536
+#: ../../WINGs/proplist.c:1075 ../../WINGs/proplist.c:1127
+#: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
+#: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
msgid "Used proplist functions on non-WMPropLists objects"
-msgstr ""
+msgstr "PropList-Funktionen werden auf nicht-WMPropList-Objekte angewendet"
#: ../../WINGs/proplist.c:630
msgid "unterminated PropList string"
-msgstr "nicht terminierter PropList string"
+msgstr "nicht terminierte PropList-Zeichenkette"
#: ../../WINGs/proplist.c:670
msgid "unterminated PropList data"
-msgstr "nicht terminiertes PropList data"
+msgstr "nicht terminierte PropList-Binärdaten"
#: ../../WINGs/proplist.c:678
msgid "unterminated PropList data (missing hexdigit)"
-msgstr "nicht terminiertes PropList data (fehlendes hex-Zeichen)"
+msgstr "nicht terminierte PropList-Binärdaten (fehlendes Hex-Zeichen)"
-#: ../../WINGs/proplist.c:690
+#: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
msgid "non hexdigit character in PropList data"
-msgstr "falsches hex-Zeichen in PropList data"
+msgstr "falsches Hex-Zeichen in PropList-Binärdaten"
-#: ../../WINGs/proplist.c:725
+#: ../../WINGs/proplist.c:729
msgid "unterminated PropList array"
-msgstr "nicht terminiertes PropList array"
+msgstr "nicht terminiertes PropList-Array"
-#: ../../WINGs/proplist.c:733
+#: ../../WINGs/proplist.c:737
msgid "missing or unterminated PropList array"
-msgstr "fehlendes oder nicht terminiertes PropList array"
+msgstr "fehlendes oder nicht terminiertes PropList-Array"
-#: ../../WINGs/proplist.c:743
+#: ../../WINGs/proplist.c:747
msgid "could not get PropList array element"
-msgstr ""
+msgstr "PropList-Array-Element konnte nicht gelesen werden"
-#: ../../WINGs/proplist.c:772
+#: ../../WINGs/proplist.c:776
msgid "unterminated PropList dictionary"
-msgstr ""
+msgstr "nicht terminiertes PropList-Dictionary"
-#: ../../WINGs/proplist.c:789
+#: ../../WINGs/proplist.c:793
msgid "missing PropList dictionary key"
-msgstr ""
+msgstr "fehlender Schlüssel in PropList-Dictionary"
-#: ../../WINGs/proplist.c:791
+#: ../../WINGs/proplist.c:795
msgid "missing PropList dictionary entry key or unterminated dictionary"
-msgstr ""
+msgstr "fehlender Schlüssel in PropList-Dictionary oder fehlende Terminierung"
-#: ../../WINGs/proplist.c:799
+#: ../../WINGs/proplist.c:803
msgid "error parsing PropList dictionary key"
-msgstr ""
+msgstr "Fehler beim Parsen eines PropList-Dictionary-Schlüssels"
-#: ../../WINGs/proplist.c:807
+#: ../../WINGs/proplist.c:811
msgid "missing = in PropList dictionary entry"
-msgstr ""
+msgstr "fehlendes \"=\" in PropList-Dictionary-Schlüssel"
-#: ../../WINGs/proplist.c:815
+#: ../../WINGs/proplist.c:819
msgid "error parsing PropList dictionary entry value"
-msgstr ""
+msgstr "Fehler beim Parsen eines PropList-Dictionary-Wertes"
-#: ../../WINGs/proplist.c:823
+#: ../../WINGs/proplist.c:827
msgid "missing ; in PropList dictionary entry"
-msgstr ""
+msgstr "fehlendes \";\" in PropList-Dictionary-Eintrag"
-#: ../../WINGs/proplist.c:884
+#: ../../WINGs/proplist.c:888
msgid ""
"was expecting a string, data, array or dictionary. If it's a string, try "
"enclosing it with \"."
msgstr ""
-"string, data, array oder dictionary wurde erwartet. Zeichenketten mit \" "
+"Zeichenkette, Binärdaten, Array oder Dictionary erwartet. Zeichenketten ggf. mit \" "
"einklammern."
-#: ../../WINGs/proplist.c:888
+#: ../../WINGs/proplist.c:892
msgid "Comments are not allowed inside WindowMaker owned domain files."
-msgstr "Kommentare sind in Domaindaten von WindowMaker nicht erlaubt."
+msgstr "Kommentare sind in Domänendaten von WindowMaker nicht erlaubt."
-#: ../../WINGs/proplist.c:1559 ../../WINGs/proplist.c:1624
+#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1630
msgid "extra data after end of property list"
msgstr "zusätzliche Daten hinter dem Ende der Propertyliste"
-#: ../../WINGs/proplist.c:1602
+#: ../../WINGs/proplist.c:1606
#, c-format
msgid "could not get size for file '%s'"
-msgstr "konnte Dateigröße von '%s' nicht ermitteln"
+msgstr "Dateigröße von '%s' konnte nicht ermittelt werden"
-#: ../../WINGs/proplist.c:1614
+#: ../../WINGs/proplist.c:1619
#, c-format
msgid "error reading from file '%s'"
msgstr "Fehler beim Lesen der Datei '%s'"
-#: ../../WINGs/proplist.c:1665
+#: ../../WINGs/proplist.c:1671
#, c-format
msgid "mkstemp (%s) failed"
-msgstr "mkstemp (%s) schlug fehl"
+msgstr "mkstemp (%s) fehlgeschlagen"
-#: ../../WINGs/proplist.c:1676
+#: ../../WINGs/proplist.c:1682
#, c-format
msgid "mktemp (%s) failed"
-msgstr "mktemp (%s) schlug fehl"
+msgstr "mktemp (%s) fehlgeschlagen"
-#: ../../WINGs/proplist.c:1687
+#: ../../WINGs/proplist.c:1693
#, c-format
msgid "open (%s) failed"
-msgstr "open (%s) schlug fehl"
+msgstr "open (%s) fehlgeschlagen"
-#: ../../WINGs/proplist.c:1694
+#: ../../WINGs/proplist.c:1700
#, c-format
msgid "writing to file: %s failed"
-msgstr "Schreiben in Datei: %s schlug fehl"
+msgstr "Schreiben in Datei: %s fehlgeschlagen"
-#: ../../WINGs/proplist.c:1702
+#: ../../WINGs/proplist.c:1708
#, c-format
msgid "fclose (%s) failed"
-msgstr "fclose (%s) schlug fehl"
+msgstr "fclose (%s) fehlgeschlagen"
-#: ../../WINGs/proplist.c:1711
+#: ../../WINGs/proplist.c:1717
#, c-format
msgid "rename ('%s' to '%s') failed"
-msgstr "rename ('%s' to '%s') schlug fehl"
+msgstr "rename ('%s' nach '%s') fehlgeschlagen"
#. something happened with the file. just overwrite it
-#: ../../WINGs/userdefaults.c:192 ../../WINGs/userdefaults.c:208
+#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204
#, c-format
msgid "cannot read domain from file '%s' when syncing"
-msgstr "Kann bei der Synchronisation nicht aus Datei '%s' lesen"
+msgstr "Bei der Synchronisation konnte nicht aus der Datei '%s' gelesen werden"
-#: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
-#: ../../WINGs/wcolor.c:291
+#: ../../WINGs/wcolor.c:237 ../../WINGs/wcolor.c:249 ../../WINGs/wcolor.c:288
+#: ../../WINGs/wcolor.c:329
#, c-format
msgid "could not allocate %s color"
-msgstr "konnte die Farbe %s nicht erzeugen"
+msgstr "Farbe %s konnte nicht erzeugt werden"
-#: ../../WINGs/wcolor.c:198
+#: ../../WINGs/wcolor.c:237
msgid "white"
-msgstr "weiß"
+msgstr "Weiß"
-#: ../../WINGs/wcolor.c:211
+#: ../../WINGs/wcolor.c:249
msgid "black"
-msgstr "schwarz"
+msgstr "Schwarz"
-#: ../../WINGs/wcolor.c:250
+#: ../../WINGs/wcolor.c:288
msgid "gray"
-msgstr "grau"
+msgstr "Grau"
-#: ../../WINGs/wcolor.c:291
+#: ../../WINGs/wcolor.c:329
msgid "dark gray"
-msgstr "dunkelgrau"
+msgstr "Dunkelgrau"
-#: ../../WINGs/wcolorpanel.c:415
+#: ../../WINGs/wcolorpanel.c:420
msgid "Colors"
msgstr "Farben"
-#: ../../WINGs/wcolorpanel.c:605 ../../WINGs/wcolorpanel.c:2824
+#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
msgid "Brightness"
msgstr "Helligkeit"
-#: ../../WINGs/wcolorpanel.c:607 ../../WINGs/wcolorpanel.c:683
-#: ../../WINGs/wcolorpanel.c:716 ../../WINGs/wcolorpanel.c:750
-#: ../../WINGs/wcolorpanel.c:810 ../../WINGs/wcolorpanel.c:844
-#: ../../WINGs/wcolorpanel.c:878 ../../WINGs/wcolorpanel.c:913
-#: ../../WINGs/wcolorpanel.c:2164 ../../WINGs/wcolorpanel.c:2826
-#: ../../WINGs/wcolorpanel.c:2862 ../../WINGs/wcolorpanel.c:2898
-#: ../../WINGs/wcolorpanel.c:3746
+#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
+#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
+#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849
+#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918
+#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831
+#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
+#: ../../WINGs/wcolorpanel.c:3745
msgid "Color Panel: Could not allocate memory"
-msgstr "Color Panel: Konnte keinen Speicher reservieren"
+msgstr "Farb-Panel: Speicher konnte nicht reserviert werden"
-#: ../../WINGs/wcolorpanel.c:680 ../../WINGs/wcolorpanel.c:681
+#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
msgid "Red"
msgstr "Rot"
-#: ../../WINGs/wcolorpanel.c:713 ../../WINGs/wcolorpanel.c:714
+#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719
msgid "Green"
msgstr "Grün"
-#: ../../WINGs/wcolorpanel.c:747 ../../WINGs/wcolorpanel.c:748
+#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753
msgid "Blue"
msgstr "Blau"
-#: ../../WINGs/wcolorpanel.c:807 ../../WINGs/wcolorpanel.c:808
+#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813
msgid "Cyan"
msgstr ""
-#: ../../WINGs/wcolorpanel.c:841 ../../WINGs/wcolorpanel.c:842
+#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847
msgid "Magenta"
msgstr ""
-#: ../../WINGs/wcolorpanel.c:875 ../../WINGs/wcolorpanel.c:876
+#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881
msgid "Yellow"
msgstr "Gelb"
-#: ../../WINGs/wcolorpanel.c:910 ../../WINGs/wcolorpanel.c:911
+#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916
msgid "Black"
msgstr "Schwarz"
-#: ../../WINGs/wcolorpanel.c:991
+#: ../../WINGs/wcolorpanel.c:996
msgid "Spectrum"
msgstr "Spektrum"
-#: ../../WINGs/wcolorpanel.c:1021
+#: ../../WINGs/wcolorpanel.c:1026
msgid "Palette"
msgstr ""
-#: ../../WINGs/wcolorpanel.c:1027
+#: ../../WINGs/wcolorpanel.c:1032
msgid "New from File..."
msgstr "Neu aus Datei..."
-#: ../../WINGs/wcolorpanel.c:1028 ../../WINGs/wcolorpanel.c:1076
-#: ../../WINGs/wcolorpanel.c:1093
+#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
+#: ../../WINGs/wcolorpanel.c:1098
msgid "Rename..."
msgstr "Umbenennen..."
-#: ../../WINGs/wcolorpanel.c:1029 ../../WINGs/wcolorpanel.c:1077
-#: ../../WINGs/wcolorpanel.c:1094 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082
+#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326
msgid "Remove"
msgstr "Entfernen"
-#: ../../WINGs/wcolorpanel.c:1030
+#: ../../WINGs/wcolorpanel.c:1035
msgid "Copy"
msgstr "Kopieren"
-#: ../../WINGs/wcolorpanel.c:1031
+#: ../../WINGs/wcolorpanel.c:1036
msgid "New from Clipboard"
msgstr "Neu aus Zwischenablage"
-#: ../../WINGs/wcolorpanel.c:1052
+#: ../../WINGs/wcolorpanel.c:1057
msgid "X11-Colors"
msgstr "X11-Farben"
-#: ../../WINGs/wcolorpanel.c:1069
+#: ../../WINGs/wcolorpanel.c:1074
msgid "Color"
msgstr "Farbe"
-#: ../../WINGs/wcolorpanel.c:1075
+#: ../../WINGs/wcolorpanel.c:1080
msgid "Add..."
msgstr "Hinzufügen..."
-#: ../../WINGs/wcolorpanel.c:1085
+#: ../../WINGs/wcolorpanel.c:1090
msgid "List"
msgstr "Liste"
-#: ../../WINGs/wcolorpanel.c:1092
+#: ../../WINGs/wcolorpanel.c:1097
msgid "New..."
msgstr "Neu..."
-#: ../../WINGs/wcolorpanel.c:1231
+#: ../../WINGs/wcolorpanel.c:1236
#, c-format
-msgid ""
-"Color Panel: Could not create directory %s needed to store configurations"
-msgstr ""
-"Color Panel: Konnte das Verzeichnis %s zum Speichern der Konfiguration nicht erzeugen"
+msgid "Color Panel: Could not create directory %s needed to store configurations"
+msgstr "Farb-Panel: Verzeichnis %s konnte zum Speichern der Konfiguration nicht erzeugt werden"
#. Delete the file, it doesn't belong here
-#: ../../WINGs/wcolorpanel.c:1237 ../../WINGs/wcolorpanel.c:3207
-#: ../../WINGs/wcolorpanel.c:3211
+#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212
+#: ../../WINGs/wcolorpanel.c:3216
msgid "File Error"
msgstr "Dateifehler"
-#: ../../WINGs/wcolorpanel.c:1238
+#: ../../WINGs/wcolorpanel.c:1243
msgid "Could not create ColorPanel configuration directory"
-msgstr "Konnte Konfigurationsverzeichnis für Farbdialog nicht erzeugen"
+msgstr "Konfigurationsverzeichnis für Farb-Panel konnte nicht erzeugt werden"
-#: ../../WINGs/wcolorpanel.c:1239 ../../WINGs/wcolorpanel.c:3208
-#: ../../WINGs/wcolorpanel.c:3213 ../../WINGs/wcolorpanel.c:3240
-#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:647
-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
-#: ../../WINGs/wfilepanel.c:971 ../../WINGs/wfontpanel.c:709
+#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
+#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
+#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650
+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
+#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:591
msgid "OK"
-msgstr "OK"
+msgstr ""
-#: ../../WINGs/wcolorpanel.c:1245 ../../WINGs/wcolorpanel.c:1281
-#: ../../WINGs/wcolorpanel.c:1299
+#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
+#: ../../WINGs/wcolorpanel.c:1304
msgid "Color Panel: Could not find file"
-msgstr "Color Panel: Konnte Datei nicht finden"
+msgstr "Farb-Panel: Datei konnte nicht gefunden werden"
-#: ../../WINGs/wcolorpanel.c:1486 ../../WINGs/wcolorpanel.c:1551
-#: ../../WINGs/wcolorpanel.c:1615
+#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
+#: ../../WINGs/wcolorpanel.c:1620
msgid "Color Panel: X failed request"
-msgstr "Color Panel: X Anfrage schlug fehl"
+msgstr "Farb-Panel: X-Anfrage fehlgeschlagen"
-#: ../../WINGs/wcolorpanel.c:2860
+#: ../../WINGs/wcolorpanel.c:2865
msgid "Saturation"
msgstr "Sättigung"
-#: ../../WINGs/wcolorpanel.c:2896
+#: ../../WINGs/wcolorpanel.c:2901
msgid "Hue"
msgstr "Farbton"
-#: ../../WINGs/wcolorpanel.c:3146
+#: ../../WINGs/wcolorpanel.c:3151
msgid "Open Palette"
msgstr "Palette öffnen"
-#: ../../WINGs/wcolorpanel.c:3208
+#: ../../WINGs/wcolorpanel.c:3213
msgid "Invalid file format !"
msgstr "Ungültiges Dateiformat!"
-#: ../../WINGs/wcolorpanel.c:3210
+#: ../../WINGs/wcolorpanel.c:3215
#, c-format
msgid "can't remove file %s"
-msgstr "kann Datei %s nicht entfernen"
+msgstr "Datei %s konnte nicht entfert werden"
-#: ../../WINGs/wcolorpanel.c:3212
+#: ../../WINGs/wcolorpanel.c:3217
msgid "Couldn't remove file from Configuration Directory !"
-msgstr "Konnte Datei nicht aus Konfigurationsverzeichnis entfernen!"
+msgstr "Datei konnte nicht aus Konfigurationsverzeichnis entfernt werden!"
-#: ../../WINGs/wcolorpanel.c:3239
+#: ../../WINGs/wcolorpanel.c:3244
msgid "Rename"
msgstr "Umbenennen"
-#: ../../WINGs/wcolorpanel.c:3239
+#: ../../WINGs/wcolorpanel.c:3244
msgid "Rename palette to:"
msgstr "Palette umbenennen in:"
-#: ../../WINGs/wcolorpanel.c:3240 ../../WINGs/wfilepanel.c:259
-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
+#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259
+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
msgid "Cancel"
msgstr "Abbrechen"
#. Careful, this palette exists already
-#: ../../WINGs/wcolorpanel.c:3256 ../../WINGs/wfilepanel.c:760
+#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763
msgid "Warning"
msgstr "Warnung"
-#: ../../WINGs/wcolorpanel.c:3257
+#: ../../WINGs/wcolorpanel.c:3262
msgid ""
"Palette already exists !\n"
"\n"
@@ -393,24 +401,24 @@
"\n"
"Überschreiben?"
-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
msgid "No"
msgstr "Nein"
-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
msgid "Yes"
msgstr "Ja"
-#: ../../WINGs/wcolorpanel.c:3289
+#: ../../WINGs/wcolorpanel.c:3294
#, c-format
msgid "Couldn't rename palette %s to %s\n"
-msgstr "Konnte Palette %s nicht in %s umbenennen\n"
+msgstr "Palette %s konnte nicht nach %s umbenannt werden\n"
-#: ../../WINGs/wcolorpanel.c:3315
+#: ../../WINGs/wcolorpanel.c:3320
msgid "This will permanently remove the palette "
-msgstr "Das wird die Palette unwiderruflich löschen "
+msgstr "Hiermit wird die Palette unwiderruflich gelöscht "
-#: ../../WINGs/wcolorpanel.c:3318
+#: ../../WINGs/wcolorpanel.c:3323
msgid ""
".\n"
"\n"
@@ -420,29 +428,29 @@
"\n"
"Sind Sie sicher, dass Sie die Palette löschen wollen?"
-#: ../../WINGs/wcolorpanel.c:3343
+#: ../../WINGs/wcolorpanel.c:3348
#, c-format
msgid "Couldn't remove palette %s\n"
-msgstr "Konnte Palette %s nicht löschen\n"
+msgstr "Palette %s konnte nicht gelöscht werden\n"
-#: ../../WINGs/wcolorpanel.c:3648
+#: ../../WINGs/wcolorpanel.c:3647
#, c-format
msgid "Could not open %s"
-msgstr "Konnte %s nicht öffnen"
+msgstr "%s konnte nicht geöffnet werden"
-#: ../../WINGs/wcolorpanel.c:3655
+#: ../../WINGs/wcolorpanel.c:3654
#, c-format
msgid "Could not create %s"
-msgstr "Konnte %s nicht erzeugen"
+msgstr "%s konnte nicht erzeugt werden"
-#: ../../WINGs/wcolorpanel.c:3666
+#: ../../WINGs/wcolorpanel.c:3665
#, c-format
msgid "Write error on file %s"
msgstr "Schreibfehler bei Datei %s"
-#: ../../WINGs/wcolorpanel.c:3711
+#: ../../WINGs/wcolorpanel.c:3710
msgid "Color Panel: Color unspecified"
-msgstr "Color Panel: Farbe nicht spezifiziert"
+msgstr "Farb-Panel: Farbe nicht spezifiziert"
#: ../../WINGs/wfilepanel.c:235
msgid "Name:"
@@ -456,208 +464,164 @@
msgid "Save"
msgstr "Speichern"
-#: ../../WINGs/wfilepanel.c:562
+#: ../../WINGs/wfilepanel.c:565
#, c-format
msgid "WINGs: could not open directory %s\n"
-msgstr "WINGs: Konnte Verzeichnis %s nicht öffen\n"
+msgstr "WINGs: Verzeichnis %s konnte nicht geöffnet werden\n"
-#: ../../WINGs/wfilepanel.c:580
+#: ../../WINGs/wfilepanel.c:583
#, c-format
msgid "WINGs: could not stat %s\n"
-msgstr "WINGs: Dateistatus von %s nicht bestimmbar\n"
+msgstr "WINGs: Dateistatus von %s unbestimmbar\n"
-#: ../../WINGs/wfilepanel.c:647 ../../WINGs/wfilepanel.c:970
-#: ../../WINGs/wfontpanel.c:708
+#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
+#: ../../WINGs/wfontpanel.c:590
msgid "Error"
msgstr "Fehler"
-#: ../../WINGs/wfilepanel.c:658
+#: ../../WINGs/wfilepanel.c:661
msgid "Create Directory"
msgstr "Verzeichnis anlegen"
-#: ../../WINGs/wfilepanel.c:659
+#: ../../WINGs/wfilepanel.c:662
msgid "Enter directory name"
msgstr "Verzeichnisname eingeben"
-#: ../../WINGs/wfilepanel.c:695 ../../WINGs/wfilepanel.c:734
-#: ../../WINGs/wfilepanel.c:765 ../../WINGs/wfilepanel.c:793
+#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
+#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
msgid "Permission denied."
msgstr "Zugriff verweigert."
-#: ../../WINGs/wfilepanel.c:698
+#: ../../WINGs/wfilepanel.c:701
#, c-format
msgid "'%s' already exists."
msgstr "'%s' existiert bereits."
-#: ../../WINGs/wfilepanel.c:701
+#: ../../WINGs/wfilepanel.c:704
msgid "Path does not exist."
msgstr "Pfad existiert nicht."
-#: ../../WINGs/wfilepanel.c:731 ../../WINGs/wfilepanel.c:790
+#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793
#, c-format
msgid "'%s' does not exist."
msgstr "'%s' existiert nicht."
-#: ../../WINGs/wfilepanel.c:738 ../../WINGs/wfilepanel.c:797
+#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
msgid "Insufficient memory available."
msgstr "Nicht genügend Speicher verfügbar."
-#: ../../WINGs/wfilepanel.c:742 ../../WINGs/wfilepanel.c:801
+#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
#, c-format
msgid "'%s' is on a read-only filesystem."
-msgstr "'%s' liegt auf einem read-only Dateisystem."
+msgstr "'%s' liegt auf einem nur lesbaren Dateisystem."
-#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:777
-#: ../../WINGs/wfilepanel.c:804
+#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
+#: ../../WINGs/wfilepanel.c:807
#, c-format
msgid "Can not delete '%s'."
msgstr "Kann %s nicht löschen."
-#: ../../WINGs/wfilepanel.c:752
+#: ../../WINGs/wfilepanel.c:755
#, c-format
msgid "Delete directory %s ?"
-msgstr "Verzeichnis % s löschen?"
+msgstr "Verzeichnis %s löschen?"
-#: ../../WINGs/wfilepanel.c:756
+#: ../../WINGs/wfilepanel.c:759
#, c-format
msgid "Delete file %s ?"
msgstr "Datei %s löschen?"
-#: ../../WINGs/wfilepanel.c:768
+#: ../../WINGs/wfilepanel.c:771
#, c-format
msgid "Directory '%s' does not exist."
msgstr "Verzeichnis '%s' existiert nicht."
-#: ../../WINGs/wfilepanel.c:771
+#: ../../WINGs/wfilepanel.c:774
#, c-format
msgid "Directory '%s' is not empty."
msgstr "Verzeichnis '%s' ist nicht leer."
-#: ../../WINGs/wfilepanel.c:774
+#: ../../WINGs/wfilepanel.c:777
#, c-format
msgid "Directory '%s' is busy."
-msgstr "Verzeichnis '%s' ist belegt."
+msgstr "Verzeichnis '%s' wird benutz."
-#: ../../WINGs/wfilepanel.c:787
+#: ../../WINGs/wfilepanel.c:790
#, c-format
msgid "'%s' is a directory."
msgstr "'%s' ist ein Verzeichnis."
-#: ../../WINGs/wfilepanel.c:829
+#: ../../WINGs/wfilepanel.c:832
#, c-format
msgid "An error occured browsing '%s'."
msgstr "Fehler beim Lesen von '%s'."
-#: ../../WINGs/wfilepanel.c:833
+#: ../../WINGs/wfilepanel.c:836
#, c-format
msgid "'%s' is not a directory."
msgstr "'%s' ist kein Verzeichnis."
-#: ../../WINGs/wfilepanel.c:970
+#: ../../WINGs/wfilepanel.c:973
msgid "File does not exist."
msgstr "Datei existiert nicht."
-#: ../../WINGs/wfont.c:129
+#: ../../WINGs/wfont.c:40
#, c-format
-msgid "the following character sets are missing in %s:"
-msgstr "die folgenden Zeichensätze fehlen in %s:"
+msgid "invalid font: %s. Trying '%s'"
+msgstr "Ungültige Schriftart: %s. Wird ersetzt durch %s."
-#: ../../WINGs/wfont.c:136
+#: ../../WINGs/wfont.c:257 ../../WINGs/wfont.c:277
#, c-format
-msgid ""
-"the string \"%s\" will be used in place of any characters from those sets."
-msgstr ""
-"die Zeichenkette \"%s\" ersetzt alle anderen Zeichen dieser Zeichensätze."
+msgid "could not load font: %s."
+msgstr "Schriftart konnte nicht geladen werden: %s"
-#: ../../WINGs/wfont.c:287 ../../WINGs/wfont.c:323
-#, c-format
-msgid "could not load font set %s. Trying fixed."
-msgstr "konnte Fonts %s nicht laden. Nehme fixed-Font."
+#. WMSetWidgetBackgroundColor(panel->win, WMWhiteColor(scr));
+#: ../../WINGs/wfontpanel.c:203
+msgid "Font Panel"
+msgstr "Schrift-Panel"
-#: ../../WINGs/wfont.c:293 ../../WINGs/wfont.c:329
-#, c-format
-msgid "could not load font %s. Trying fixed."
-msgstr "Konnte Font %s nicht laden. Nehme fixed-Font."
-
-#: ../../WINGs/wfont.c:297 ../../WINGs/wfont.c:333
-msgid "could not load fixed font!"
-msgstr "konnte fixed-Font nicht laden!"
-
-#: ../../WINGs/wfont.c:428
-#, c-format
-msgid "font description %s is too large."
-msgstr "Fontbeschreibung %s ist zu groß."
-
-#: ../../WINGs/wfontpanel.c:205
-msgid "Test!!!"
-msgstr "Test!"
+#: ../../WINGs/wfontpanel.c:239
+msgid "The quick brown fox jumps over the lazy dog"
+msgstr ""
-#: ../../WINGs/wfontpanel.c:211
+#: ../../WINGs/wfontpanel.c:245
msgid "Family"
msgstr "Familie"
-#: ../../WINGs/wfontpanel.c:222
+#: ../../WINGs/wfontpanel.c:256
msgid "Typeface"
msgstr "Schriftart"
-#: ../../WINGs/wfontpanel.c:233
+#: ../../WINGs/wfontpanel.c:267
msgid "Size"
msgstr "Größe"
-#: ../../WINGs/wfontpanel.c:252
+#: ../../WINGs/wfontpanel.c:286
msgid "Set"
msgstr "Setzen"
-#: ../../WINGs/wfontpanel.c:257
+#: ../../WINGs/wfontpanel.c:292
msgid "Revert"
-msgstr "Zurückn."
+msgstr "Zurücksetzen"
-#: ../../WINGs/wfontpanel.c:709
-msgid "Could not retrieve font list"
-msgstr "Konnte Fontliste nicht wiederherstellen"
+#: ../../WINGs/wfontpanel.c:591
+msgid "Could not init font config library\n"
+msgstr "\"font-config\"-Bibliothek konnte nicht initialisiert werden\n"
-#: ../../WINGs/wfontpanel.c:721
-#, c-format
-msgid "font name %s is longer than 256, which is invalid."
-msgstr "Fontname %s ist ungültig, da länger als 256 Zeichen."
-
-#: ../../WINGs/wfontpanel.c:868
-msgid "Roman"
-msgstr "Roman"
-
-#: ../../WINGs/wfontpanel.c:871
-msgid "Italic"
-msgstr "Kursiv"
-
-#: ../../WINGs/wfontpanel.c:873
-msgid "Oblique"
-msgstr "Schräg"
-
-#: ../../WINGs/wfontpanel.c:875
-msgid "Rev Italic"
-msgstr ""
-
-#: ../../WINGs/wfontpanel.c:877
-msgid "Rev Oblique"
-msgstr ""
-
-#: ../../WINGs/wfontpanel.c:883
-msgid "Normal"
-msgstr "Normal"
-
-#: ../../WINGs/widgets.c:415
+#: ../../WINGs/widgets.c:419
#, c-format
msgid "WINGs: could not load widget images file: %s"
-msgstr "WINGs: Konnte Widget-Bildatei %s nicht laden."
+msgstr "WINGs: Widget-Bilderdatei konnte nicht geladen werden: %s"
-#: ../../WINGs/widgets.c:763
+#: ../../WINGs/widgets.c:767
msgid ""
-"could not load any fonts. Make sure your font installationand locale "
+"could not load any fonts. Make sure your font installation and locale "
"settings are correct."
msgstr ""
-"Konnte keine Fonts laden. Überprüfen Sie, ob Ihre Fontinstallation und "
-"-einstellungen korrekt sind."
+"Keine Schrifen konnten geladen werden. Überprüfen Sie, ob Ihre Schrifteninstallation und -"
+"Lokalisierungseinstellungen korrekt sind."
-#: ../../WINGs/wruler.c:189
+#: ../../WINGs/wruler.c:192
msgid "0 inches"
msgstr "0 Inch"
+
diff -uhrN WindowMaker-0.92.0/WINGs/selection.c WindowMaker-CVS-20060123/WINGs/selection.c
--- WindowMaker-0.92.0/WINGs/selection.c 2004-10-12 20:31:44.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/selection.c 2005-08-23 00:12:16.000000000 +0200
@@ -279,7 +279,7 @@
WMData *wdata;
unsigned char *data;
Atom rtype;
- unsigned bits, bpi;
+ int bits, bpi;
unsigned long len, bytes;
diff -uhrN WindowMaker-0.92.0/WINGs/wapplication.c WindowMaker-CVS-20060123/WINGs/wapplication.c
--- WindowMaker-0.92.0/WINGs/wapplication.c 2004-10-24 05:13:29.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/wapplication.c 2005-07-17 20:33:09.000000000 +0200
@@ -181,7 +181,6 @@
return path;
}
-
if (getenv("GNUSTEP_SYSTEM_ROOT")) {
path = checkFile(getenv("GNUSTEP_SYSTEM_ROOT"), appdir, ext, resource);
if (path) {
diff -uhrN WindowMaker-0.92.0/WINGs/wbrowser.c WindowMaker-CVS-20060123/WINGs/wbrowser.c
--- WindowMaker-0.92.0/WINGs/wbrowser.c 2004-10-12 22:43:22.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/wbrowser.c 2006-01-22 16:47:25.000000000 +0100
@@ -188,7 +188,7 @@
int curMaxVisibleColumns;
int newFirstVisibleColumn = 0;
- assert ((int) bPtr);
+ assert (bPtr != NULL);
columns = (columns < MIN_VISIBLE_COLUMNS) ? MIN_VISIBLE_COLUMNS : columns;
columns = (columns > MAX_VISIBLE_COLUMNS) ? MAX_VISIBLE_COLUMNS : columns;
@@ -324,7 +324,7 @@
WMList **clist;
char **tlist;
- assert ((int) bPtr);
+ assert (bPtr != NULL);
column = (column < 0) ? 0 : column;
if (column >= bPtr->columnCount) {
diff -uhrN WindowMaker-0.92.0/WINGs/wcolor.c WindowMaker-CVS-20060123/WINGs/wcolor.c
--- WindowMaker-0.92.0/WINGs/wcolor.c 2004-10-25 03:48:39.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/wcolor.c 2005-08-23 00:36:29.000000000 +0200
@@ -7,12 +7,12 @@
#define LIGHT_STIPPLE_WIDTH 4
#define LIGHT_STIPPLE_HEIGHT 4
-static unsigned char LIGHT_STIPPLE_BITS[] = {
+static char LIGHT_STIPPLE_BITS[] = {
0x05, 0x0a, 0x05, 0x0a};
#define DARK_STIPPLE_WIDTH 4
#define DARK_STIPPLE_HEIGHT 4
-static unsigned char DARK_STIPPLE_BITS[] = {
+static char DARK_STIPPLE_BITS[] = {
0x0a, 0x04, 0x0a, 0x01};
diff -uhrN WindowMaker-0.92.0/WINGs/wfont.c WindowMaker-CVS-20060123/WINGs/wfont.c
--- WindowMaker-0.92.0/WINGs/wfont.c 2004-10-30 08:29:25.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/wfont.c 2005-08-23 01:22:44.000000000 +0200
@@ -27,7 +27,7 @@
/* Just skip old font names that contain %d in them.
* We don't support that anymore. */
if (strchr(xlfd, '%')!=NULL)
- return FcNameParse(DEFAULT_FONT);
+ return FcNameParse((FcChar8*)DEFAULT_FONT);
fname= wstrdup(xlfd);
if ((ptr = strchr(fname, ','))) {
@@ -38,7 +38,7 @@
if (!pattern) {
wwarning(_("invalid font: %s. Trying '%s'"), xlfd, DEFAULT_FONT);
- pattern = FcNameParse(DEFAULT_FONT);
+ pattern = FcNameParse((FcChar8*)DEFAULT_FONT);
}
return pattern;
@@ -52,7 +52,7 @@
char *fname;
pattern = xlfdToFcPattern(xlfd);
- fname = FcNameUnparse(pattern);
+ fname = (char*)FcNameUnparse(pattern);
FcPatternDestroy(pattern);
return fname;
@@ -102,7 +102,7 @@
if (font[0]=='-') {
pattern = xlfdToFcPattern(font);
} else {
- pattern = FcNameParse(font);
+ pattern = FcNameParse((FcChar8*)font);
}
/*FcPatternPrint(pattern);*/
@@ -116,12 +116,12 @@
}
if (fallback && !hasPropertyWithStringValue(pattern, FC_FAMILY, fallback)) {
- FcPatternAddString(pattern, FC_FAMILY, fallback);
+ FcPatternAddString(pattern, FC_FAMILY, (FcChar8*)fallback);
}
/*FcPatternPrint(pattern);*/
- result = FcNameUnparse(pattern);
+ result = (char*)FcNameUnparse(pattern);
FcPatternDestroy(pattern);
return result;
@@ -366,7 +366,7 @@
* return the closest match font to what we requested which is the
* oblique font. Same goes for using bold for weight.
*/
- pattern = FcNameParse(WMGetFontName(font));
+ pattern = FcNameParse((FcChar8*)WMGetFontName(font));
switch (style) {
case WFSNormal:
FcPatternDel(pattern, FC_WEIGHT);
@@ -374,21 +374,21 @@
break;
case WFSBold:
FcPatternDel(pattern, FC_WEIGHT);
- FcPatternAddString(pattern, FC_WEIGHT, "bold");
+ FcPatternAddString(pattern, FC_WEIGHT, (FcChar8*)"bold");
break;
case WFSItalic:
FcPatternDel(pattern, FC_SLANT);
- FcPatternAddString(pattern, FC_SLANT, "italic");
+ FcPatternAddString(pattern, FC_SLANT, (FcChar8*)"italic");
break;
case WFSBoldItalic:
FcPatternDel(pattern, FC_WEIGHT);
FcPatternDel(pattern, FC_SLANT);
- FcPatternAddString(pattern, FC_WEIGHT, "bold");
- FcPatternAddString(pattern, FC_SLANT, "italic");
+ FcPatternAddString(pattern, FC_WEIGHT, (FcChar8*)"bold");
+ FcPatternAddString(pattern, FC_SLANT, (FcChar8*)"italic");
break;
}
- name = FcNameUnparse(pattern);
+ name = (char*)FcNameUnparse(pattern);
copy = WMCreateFont(scrPtr, name);
FcPatternDestroy(pattern);
wfree(name);
diff -uhrN WindowMaker-0.92.0/WINGs/wfontpanel.c WindowMaker-CVS-20060123/WINGs/wfontpanel.c
--- WindowMaker-0.92.0/WINGs/wfontpanel.c 2004-10-23 04:44:17.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/wfontpanel.c 2005-08-23 01:12:49.000000000 +0200
@@ -83,7 +83,7 @@
-static void setFontPanelFontName(FontPanel *panel, FcChar8 *family, FcChar8 *style, double size);
+static void setFontPanelFontName(FontPanel *panel, char *family, char *style, double size);
static int isXLFD(char *font, int *length_ret);
@@ -370,7 +370,7 @@
if (!isXLFD(fontName, &fname_len)) {
/* maybe its proper fontconfig and we can parse it */
- pattern = FcNameParse(fontName);
+ pattern = FcNameParse((FcChar8*)fontName);
} else {
/* maybe its proper xlfd and we can convert it to an FcPattern */
pattern = XftXlfdParse(fontName, False, False);
@@ -383,7 +383,7 @@
if (FcPatternGetString(pattern, FC_FAMILY, 0, &family)==FcResultMatch)
if (FcPatternGetString(pattern, FC_STYLE, 0, &style)==FcResultMatch)
if (FcPatternGetDouble(pattern, "pixelsize", 0, &size)==FcResultMatch)
- setFontPanelFontName(panel, family, style, size);
+ setFontPanelFontName(panel, (char*)family, (char*)style, size);
FcPatternDestroy(pattern);
}
@@ -603,7 +603,7 @@
if (FcPatternGetString(fs->fonts[i],FC_FAMILY,0,&family)==FcResultMatch)
if (FcPatternGetString(fs->fonts[i],FC_STYLE,0,&style)==FcResultMatch)
- addFontToXftFamily(families, family, style);
+ addFontToXftFamily(families, (char*)family, (char*)style);
}
FcFontSetDestroy(fs);
}
@@ -815,7 +815,7 @@
static void
-setFontPanelFontName(FontPanel *panel, FcChar8 *family, FcChar8 *style, double size)
+setFontPanelFontName(FontPanel *panel, char *family, char *style, double size)
{
int famrow;
int stlrow;
diff -uhrN WindowMaker-0.92.0/WINGs/widgets.c WindowMaker-CVS-20060123/WINGs/widgets.c
--- WindowMaker-0.92.0/WINGs/widgets.c 2004-10-28 04:15:54.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/widgets.c 2005-08-23 00:41:43.000000000 +0200
@@ -305,7 +305,7 @@
#define STIPPLE_WIDTH 8
#define STIPPLE_HEIGHT 8
-static unsigned char STIPPLE_BITS[] = {
+static char STIPPLE_BITS[] = {
0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55
};
diff -uhrN WindowMaker-0.92.0/WINGs/WINGs/WINGsP.h WindowMaker-CVS-20060123/WINGs/WINGs/WINGsP.h
--- WindowMaker-0.92.0/WINGs/WINGs/WINGsP.h 2004-10-30 08:32:50.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/WINGs/WINGsP.h 2006-01-22 21:18:55.000000000 +0100
@@ -29,7 +29,7 @@
#define SCROLLER_WIDTH 20
-#define XDND_VERSION 4
+#define XDND_VERSION 3
typedef struct W_Application {
@@ -78,7 +78,7 @@
typedef struct W_FocusInfo {
struct W_View *toplevel;
- struct W_View *focused; /* view that has the focus in this toplevel */
+ struct W_View *focused; /* view that has the focus in this toplevel */
struct W_FocusInfo *next;
} W_FocusInfo;
@@ -110,8 +110,10 @@
typedef struct W_DragDestinationInfo {
WMView *destView;
+ WMView *xdndAwareView;
Window sourceWindow;
W_DndState *state;
+ Bool sourceActionChanged;
WMArray *sourceTypes;
WMArray *requiredTypes;
Bool typeListAvailable;
@@ -120,7 +122,7 @@
struct W_DraggingInfo {
- unsigned char protocolVersion;
+ unsigned char protocolVersion; /* version supported on the other side */
Time timestamp;
Atom sourceAction;
@@ -162,7 +164,7 @@
struct W_Window *windowList; /* list of windows in the app */
- Window groupLeader; /* the leader of the application */
+ Window groupLeader; /* the leader of the application */
/* also used for other things */
struct W_SelectionHandlers *selectionHandlerList;
@@ -195,11 +197,11 @@
GC copyGC;
GC clipGC;
- GC monoGC; /* GC for 1bpp visuals */
+ GC monoGC; /* GC for 1bpp visuals */
GC xorGC;
- GC ixorGC; /* IncludeInferiors XOR */
+ GC ixorGC; /* IncludeInferiors XOR */
GC drawStringGC; /* for WMDrawString() */
@@ -276,15 +278,15 @@
Cursor invisibleCursor;
- Atom attribsAtom; /* GNUstepWindowAttributes */
+ Atom attribsAtom; /* GNUstepWindowAttributes */
- Atom deleteWindowAtom; /* WM_DELETE_WINDOW */
+ Atom deleteWindowAtom; /* WM_DELETE_WINDOW */
- Atom protocolsAtom; /* _XA_WM_PROTOCOLS */
+ Atom protocolsAtom; /* _XA_WM_PROTOCOLS */
- Atom clipboardAtom; /* CLIPBOARD */
+ Atom clipboardAtom; /* CLIPBOARD */
- Atom xdndAwareAtom; /* XdndAware */
+ Atom xdndAwareAtom; /* XdndAware */
Atom xdndSelectionAtom;
Atom xdndEnterAtom;
Atom xdndLeaveAtom;
@@ -304,7 +306,7 @@
Atom wmIconDragOffsetAtom;
- Atom wmStateAtom; /* WM_STATE */
+ Atom wmStateAtom; /* WM_STATE */
Atom utf8String;
@@ -313,8 +315,8 @@
Atom netwmIcon;
/* stuff for detecting double-clicks */
- Time lastClickTime; /* time of last mousedown event */
- Window lastClickWindow; /* window of the last mousedown */
+ Time lastClickTime; /* time of last mousedown event */
+ Window lastClickWindow; /* window of the last mousedown */
struct W_View *modalView;
unsigned modalLoop:1;
@@ -341,8 +343,7 @@
typedef struct W_View {
struct W_Screen *screen;
- WMWidget *self; /* must point to the widget the
- * view belongs to */
+ WMWidget *self; /* must point to the widget the view belongs to */
W_ViewDelegate *delegate;
@@ -362,18 +363,18 @@
struct W_View *nextResponder; /* next to receive keyboard events */
- struct W_View *parent; /* parent WMView */
+ struct W_View *parent; /* parent WMView */
struct W_View *childrenList; /* first in list of child windows */
- struct W_View *nextSister; /* next on parent's children list */
+ struct W_View *nextSister; /* next on parent's children list */
- WMArray *eventHandlers; /* event handlers for this window */
+ WMArray *eventHandlers; /* event handlers for this window */
unsigned long attribFlags;
XSetWindowAttributes attribs;
- void *hangedData; /* data holder for user program */
+ void *hangedData; /* data holder for user program */
WMColor *backColor;
@@ -391,9 +392,9 @@
unsigned int realized:1;
unsigned int mapped:1;
unsigned int parentDying:1;
- unsigned int dying:1; /* the view is being destroyed */
+ unsigned int dying:1; /* the view is being destroyed */
unsigned int topLevel:1; /* is a top level window */
- unsigned int root:1; /* is the root window */
+ unsigned int root:1; /* is the root window */
unsigned int mapWhenRealized:1; /* map the view when it's realized */
unsigned int alreadyDead:1; /* view was freed */
diff -uhrN WindowMaker-0.92.0/WINGs/wtext.c WindowMaker-CVS-20060123/WINGs/wtext.c
--- WindowMaker-0.92.0/WINGs/wtext.c 2004-10-28 05:14:55.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/wtext.c 2006-01-22 16:47:25.000000000 +0100
@@ -207,7 +207,7 @@
#define STIPPLE_WIDTH 8
#define STIPPLE_HEIGHT 8
-static unsigned char STIPPLE_BITS[] = {
+static char STIPPLE_BITS[] = {
0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa
};
@@ -1969,7 +1969,7 @@
} else if(tb->used == 0) {
tb->blank = 1;
} else if(tb->graphic) {
- Bool hasNext = (Bool)(tb->next);
+ Bool hasNext = (tb->next != NULL);
WMDestroyTextBlock(tPtr, WMRemoveTextBlock(tPtr));
if(hasNext) {
diff -uhrN WindowMaker-0.92.0/WINGs/wview.c WindowMaker-CVS-20060123/WINGs/wview.c
--- WindowMaker-0.92.0/WINGs/wview.c 2004-10-28 04:41:04.000000000 +0200
+++ WindowMaker-CVS-20060123/WINGs/wview.c 2006-01-22 19:08:39.000000000 +0100
@@ -450,6 +450,9 @@
W_FreeViewXdndPart(view);
+ if (view->backColor)
+ WMReleaseColor(view->backColor);
+
wfree(view);
}
@@ -715,7 +718,8 @@
{
WMScreen *scr = W_VIEW_SCREEN(view);
Window foo;
- int x, y, topX, topY, bar;
+ int x, y, topX, topY;
+ unsigned int bar;
WMView *topView;
topView = view;
diff -uhrN WindowMaker-0.92.0/WPrefs.app/FontSimple.c WindowMaker-CVS-20060123/WPrefs.app/FontSimple.c
--- WindowMaker-0.92.0/WPrefs.app/FontSimple.c 2004-10-26 14:03:42.000000000 +0200
+++ WindowMaker-CVS-20060123/WPrefs.app/FontSimple.c 2005-08-23 01:15:17.000000000 +0200
@@ -231,11 +231,11 @@
for (i= 0; i < fonts->nfont; i++)
{
- FcChar8 *name;
+ char *name;
int weight, slant, width;
int j, found;
- if (FcPatternGetString(fonts->fonts[i], FC_FAMILY, 0, &name) != FcResultMatch)
+ if (FcPatternGetString(fonts->fonts[i], FC_FAMILY, 0, (FcChar8**)&name) != FcResultMatch)
continue;
if (FcPatternGetInteger(fonts->fonts[i], FC_WEIGHT, 0, &weight) != FcResultMatch)
@@ -309,7 +309,7 @@
static char*
-getSelectedFont(_Panel *panel, char *curfont)
+getSelectedFont(_Panel *panel, FcChar8 *curfont)
{
WMListItem *item;
FcPattern *pat= FcNameParse(curfont);
@@ -319,7 +319,7 @@
if (item)
{
FcPatternDel(pat, FC_FAMILY);
- FcPatternAddString(pat, FC_FAMILY, item->text);
+ FcPatternAddString(pat, FC_FAMILY, (FcChar8*)item->text);
}
item= WMGetListSelectedItem(panel->styleL);
@@ -344,9 +344,9 @@
FcPatternAddDouble(pat, FC_PIXEL_SIZE, atoi(item->text));
}
- name= FcNameUnparse(pat);
+ name = (char*)FcNameUnparse(pat);
FcPatternDestroy(pat);
-
+
return name;
}
@@ -446,12 +446,13 @@
{
int index= WMGetPopUpButtonSelectedItem(panel->optionP);
WMMenuItem *item= WMGetPopUpButtonMenuItem(panel->optionP, index);
- char *ofont, *nfont;
+ FcChar8 *ofont;
+ char *nfont;
- ofont= (char*)WMGetMenuItemRepresentedObject(item);
-
+ ofont= (FcChar8*)WMGetMenuItemRepresentedObject(item);
nfont= getSelectedFont(panel, ofont);
- free(ofont);
+ wfree(ofont);
+
WMSetMenuItemRepresentedObject(item, nfont);
}
updateSampleFont(panel);
@@ -465,12 +466,13 @@
_Panel *panel= (_Panel*)data;
int index= WMGetPopUpButtonSelectedItem(panel->optionP);
WMMenuItem *item= WMGetPopUpButtonMenuItem(panel->optionP, index);
- char *ofont, *nfont;
+ FcChar8 *ofont;
+ char *nfont;
- ofont= (char*)WMGetMenuItemRepresentedObject(item);
-
+ ofont = (FcChar8*)WMGetMenuItemRepresentedObject(item);
nfont= getSelectedFont(panel, ofont);
- free(ofont);
+ wfree(ofont);
+
WMSetMenuItemRepresentedObject(item, nfont);
updateSampleFont(panel);
@@ -490,10 +492,10 @@
{
FcPattern *pat;
- pat= FcNameParse(font);
+ pat= FcNameParse((FcChar8*)font);
if (pat)
{
- FcChar8 *name;
+ char *name;
int weight, slant, width;
double size;
int distance, closest, found;
@@ -501,7 +503,7 @@
FcDefaultSubstitute(pat);
- if (FcPatternGetString(pat, FC_FAMILY, 0, &name) != FcResultMatch)
+ if (FcPatternGetString(pat, FC_FAMILY, 0, (FcChar8**)&name) != FcResultMatch)
name= "sans serif";
found= 0;
diff -uhrN WindowMaker-0.92.0/WPrefs.app/main.c WindowMaker-CVS-20060123/WPrefs.app/main.c
--- WindowMaker-0.92.0/WPrefs.app/main.c 2004-10-19 04:41:54.000000000 +0200
+++ WindowMaker-CVS-20060123/WPrefs.app/main.c 2005-07-17 21:15:36.000000000 +0200
@@ -100,7 +100,7 @@
{
Display *dpy;
WMScreen *scr;
- char *locale;
+ char *locale, *path;
int i;
char *display_name="";
@@ -110,6 +110,20 @@
WMInitializeApplication("WPrefs", &argc, argv);
+ WMSetResourcePath(RESOURCE_PATH);
+ path = WMPathForResourceOfType("WPrefs.tiff", NULL);
+ if (!path) {
+ /* maybe it is run directly from the source directory */
+ WMSetResourcePath(".");
+ path = WMPathForResourceOfType("WPrefs.tiff", NULL);
+ if (!path) {
+ WMSetResourcePath("..");
+ }
+ }
+ if (path) {
+ wfree(path);
+ }
+
if (argc>1) {
for (i=1; i<argc; i++) {
if (strcmp(argv[i], "-version")==0
diff -uhrN WindowMaker-0.92.0/WPrefs.app/Makefile.am WindowMaker-CVS-20060123/WPrefs.app/Makefile.am
--- WindowMaker-0.92.0/WPrefs.app/Makefile.am 2004-11-06 20:41:39.000000000 +0100
+++ WindowMaker-CVS-20060123/WPrefs.app/Makefile.am 2005-07-17 20:21:00.000000000 +0200
@@ -42,7 +42,7 @@
imagebrowser.h \
xmodifier.c
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\"
AM_CFLAGS = @NOSTRICTALIASING@
diff -uhrN WindowMaker-0.92.0/WPrefs.app/Makefile.in WindowMaker-CVS-20060123/WPrefs.app/Makefile.in
--- WindowMaker-0.92.0/WPrefs.app/Makefile.in 2005-06-19 05:23:01.000000000 +0200
+++ WindowMaker-CVS-20060123/WPrefs.app/Makefile.in 2006-01-22 21:33:54.000000000 +0100
@@ -129,7 +129,7 @@
WPrefs_SOURCES = main.c WPrefs.c WPrefs.h Appearance.c Configurations.c Expert.c Focus.c FontSimple.c Icons.c KeyboardSettings.c KeyboardShortcuts.c Menu.c MenuPreferences.c MouseSettings.c Paths.c Preferences.c TexturePanel.c TexturePanel.h Themes.c WindowHandling.c Workspace.c double.c double.h editmenu.c editmenu.h imagebrowser.c imagebrowser.h xmodifier.c
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\"
AM_CFLAGS = @NOSTRICTALIASING@
diff -uhrN WindowMaker-0.92.0/WPrefs.app/po/de.po WindowMaker-CVS-20060123/WPrefs.app/po/de.po
--- WindowMaker-0.92.0/WPrefs.app/po/de.po 2004-10-17 08:28:06.000000000 +0200
+++ WindowMaker-CVS-20060123/WPrefs.app/po/de.po 2005-07-05 21:39:14.000000000 +0200
@@ -1,17 +1,26 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# translation of wprefsneu.po to
+#
+# German Message Catalog for WPrefs.app
+#
+# Initial translation
+# Gudio Scholz <guido.scholz@bayernline.de>
+# Bernd Eggert <Bernd.Eggert@t-online.de>
+#
+# Fully retranslated and updated for newer versions
+# Torsten Marek <shlomme@gmx.net>
+# , 2004.
#
msgid ""
msgstr ""
-"Project-Id-Version: WPrefs 0.45\n"
-"POT-Creation-Date: 2003-01-06 01:33+0100\n"
-"PO-Revision-Date: 2003-01-25 16:00CET\n"
-"Last-Translator: Guido Scholz <guido.scholz@bayernline.de>\n"
-"Language-Team: Deutsch <de@li.org>\n"
+"Project-Id-Version: wprefsneu\n"
+"POT-Creation-Date: 2004-11-05 23:50+0100\n"
+"PO-Revision-Date: 2004-11-14 13:15+0100\n"
+"Last-Translator: \n"
+"Language-Team: <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
#: ../../WPrefs.app/Appearance.c:1154
msgid "Select File"
@@ -27,19 +36,20 @@
#: ../../WPrefs.app/Appearance.c:1565
msgid "Owner of Focused Window"
-msgstr "Eigentümer des akt. Fensters"
+msgstr "Eigentümer des aktiven Fensters"
#: ../../WPrefs.app/Appearance.c:1570 ../../WPrefs.app/Appearance.c:1893
+#: ../../WPrefs.app/FontSimple.c:108
msgid "Menu Title"
msgstr "Menütitel"
#: ../../WPrefs.app/Appearance.c:1575 ../../WPrefs.app/Appearance.c:1578
msgid "Normal Item"
-msgstr "Normal"
+msgstr "Normaler Eintrag"
#: ../../WPrefs.app/Appearance.c:1583
msgid "Disabled Item"
-msgstr "Deaktiviert"
+msgstr "Ausgeschalteter Eintrag"
#: ../../WPrefs.app/Appearance.c:1595
msgid "Highlighted"
@@ -59,11 +69,11 @@
#: ../../WPrefs.app/Appearance.c:1796
msgid "Titlebar of Focused Window's Owner"
-msgstr "Titelleiste d. Eigent. d. akt. Fensters"
+msgstr "Titelleiste des Eigentümers des aktiven Fensters"
#: ../../WPrefs.app/Appearance.c:1797
msgid "Window Resizebar"
-msgstr "Fenster-Größenänderungsleiste"
+msgstr "Größenänderungsleiste"
#: ../../WPrefs.app/Appearance.c:1798
msgid "Titlebar of Menus"
@@ -91,19 +101,19 @@
#: ../../WPrefs.app/Appearance.c:1833
msgid "Create a new texture."
-msgstr "Neue Textur erzeugen."
+msgstr "Neue Textur erstellen."
#: ../../WPrefs.app/Appearance.c:1841
msgid "Extract..."
-msgstr "Extrahieren..."
+msgstr "Holen"
#: ../../WPrefs.app/Appearance.c:1845
msgid "Extract texture(s) from a theme or a style file."
-msgstr "Extrahiere Textur(en) aus einer Themen- oder Stildatei."
+msgstr "Textur(en) aus einer Themen- oder Stildatei holen."
#: ../../WPrefs.app/Appearance.c:1855
msgid "Edit"
-msgstr "Bearbeiten"
+msgstr "Ändern"
#: ../../WPrefs.app/Appearance.c:1858
msgid "Edit the highlighted texture."
@@ -131,7 +141,7 @@
#: ../../WPrefs.app/Appearance.c:1892
msgid "Owner of Focused Window Title"
-msgstr "Titel d. Eigentümers d. akt. Fensters"
+msgstr "Titel des Eigentümers des aktiven Fensters"
#: ../../WPrefs.app/Appearance.c:1894
msgid "Menu Item Text"
@@ -139,7 +149,7 @@
#: ../../WPrefs.app/Appearance.c:1895
msgid "Disabled Menu Item Text"
-msgstr "Text eines deaktiv. Menüeintrages"
+msgstr "Text eines ausgeschalteten Menüeintrages"
#: ../../WPrefs.app/Appearance.c:1896
msgid "Menu Highlight Color"
@@ -147,7 +157,7 @@
#: ../../WPrefs.app/Appearance.c:1897
msgid "Highlighted Menu Text Color"
-msgstr "Text des ausgew. Menüeintrages"
+msgstr "Text des ausgewählten Menüeintrages"
#: ../../WPrefs.app/Appearance.c:1936
msgid "Background"
@@ -163,23 +173,23 @@
#: ../../WPrefs.app/Appearance.c:1968
msgid "Menu Style"
-msgstr " Menüstil "
+msgstr "Menü-Stil"
-#: ../../WPrefs.app/Appearance.c:1996 ../../WPrefs.app/Configurations.c:242
-#: ../../WPrefs.app/Configurations.c:254 ../../WPrefs.app/Focus.c:288
+#: ../../WPrefs.app/Appearance.c:1996 ../../WPrefs.app/Configurations.c:241
+#: ../../WPrefs.app/Configurations.c:253 ../../WPrefs.app/Focus.c:288
#: ../../WPrefs.app/Focus.c:299 ../../WPrefs.app/MenuPreferences.c:134
#: ../../WPrefs.app/MenuPreferences.c:145
#: ../../WPrefs.app/MenuPreferences.c:173
#: ../../WPrefs.app/MenuPreferences.c:188 ../../WPrefs.app/MouseSettings.c:560
-#: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:558
-#: ../../WPrefs.app/WPrefs.c:583
+#: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:546
+#: ../../WPrefs.app/WPrefs.c:571
#, c-format
msgid "could not load icon file %s"
-msgstr "Symboldatei %s konnte nicht geladen werden"
+msgstr "Symboldatei %s konnte nicht geöffnet werden"
#: ../../WPrefs.app/Appearance.c:2010
msgid "Title Alignment"
-msgstr " Titelausrichtung "
+msgstr "Titel-Ausrichtung"
#: ../../WPrefs.app/Appearance.c:2017
msgid "Left"
@@ -214,13 +224,13 @@
msgid "Textures"
msgstr "Texturen"
-#: ../../WPrefs.app/Appearance.c:2325 ../../WPrefs.app/WPrefs.c:302
+#: ../../WPrefs.app/Appearance.c:2325 ../../WPrefs.app/WPrefs.c:301
msgid "Close"
msgstr "Schließen"
#: ../../WPrefs.app/Appearance.c:2330
msgid "Extract"
-msgstr "Extrahieren"
+msgstr "Holen"
#: ../../WPrefs.app/Configurations.c:150 ../../WPrefs.app/Configurations.c:156
#: ../../WPrefs.app/MouseSettings.c:490 ../../WPrefs.app/WindowHandling.c:339
@@ -228,250 +238,239 @@
#: ../../WPrefs.app/Workspace.c:101
#, c-format
msgid "could not load icon %s"
-msgstr "Symbol %s konnte nicht geladen werden"
+msgstr "Symboldatei %s konnte nicht geöffnet werden"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
msgid "could not process icon %s:"
-msgstr "Symbol %s konnte nicht verarbeitet werden"
+msgstr "Symboldatei %s konnte nicht verarbeitet werden"
-#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
+#: ../../WPrefs.app/Configurations.c:188 ../../WPrefs.app/Workspace.c:164
#, c-format
msgid "could not load image file %s"
msgstr "Bilddatei %s konnte nicht geladen werden"
-#: ../../WPrefs.app/Configurations.c:203
+#: ../../WPrefs.app/Configurations.c:202
msgid "Icon Slide Speed"
msgstr "Symbol-Bewegungsgeschwindigkeit"
-#: ../../WPrefs.app/Configurations.c:209
+#: ../../WPrefs.app/Configurations.c:208
msgid "Shade Animation Speed"
msgstr "Roll-Animationsgeschwindigkeit"
-#: ../../WPrefs.app/Configurations.c:271
+#: ../../WPrefs.app/Configurations.c:270
msgid "Smooth Scaling"
msgstr "Weiche Skalierung"
-#: ../../WPrefs.app/Configurations.c:272
+#: ../../WPrefs.app/Configurations.c:271
msgid ""
"Smooth scaled background images, neutralizing\n"
"the `pixelization' effect. This will slow\n"
"down loading of background images considerably."
msgstr ""
-"Weich skalierte Hintergrundbilder, neutralisiert\n"
-"Verpixelungen. Diese Option verlangsamt\n"
-"deutlich das Laden von Hintergrundbildern."
+"Weiche Skalierung von Hintergrundbilderverhindert\n"
+"Verpixelungen, aber führt zu einem deutlich\n"
+"längeren Ladeprozess."
-#: ../../WPrefs.app/Configurations.c:313
+#: ../../WPrefs.app/Configurations.c:312
msgid "Titlebar Style"
msgstr "Titelleisten-Stil"
-#: ../../WPrefs.app/Configurations.c:351
+#: ../../WPrefs.app/Configurations.c:350
msgid "Animations and Sound"
msgstr "Animationen und Klänge"
-#: ../../WPrefs.app/Configurations.c:357
+#: ../../WPrefs.app/Configurations.c:356
msgid "Animations"
msgstr "Animationen"
-#: ../../WPrefs.app/Configurations.c:368
+#: ../../WPrefs.app/Configurations.c:367
msgid ""
"Disable/enable animations such as those shown\n"
"for window miniaturization, shading etc."
msgstr ""
-"Animationen für Fenster-Minimierung,\n"
-"-Aufrollen usw. ein/ausschalten."
+"Animationen wie Fenster-Minimierung, Rollen usw. \n"
+"ein-/ausschalten"
-#: ../../WPrefs.app/Configurations.c:376
+#: ../../WPrefs.app/Configurations.c:375
msgid "Superfluous"
-msgstr "Effekte"
+msgstr "Zusätzliche Effekte"
-#: ../../WPrefs.app/Configurations.c:387
+#: ../../WPrefs.app/Configurations.c:386
msgid ""
"Disable/enable `superfluous' features and\n"
"animations. These include the `ghosting' of the\n"
"dock when it's being moved to another side and\n"
"the explosion animation when undocking icons."
msgstr ""
-"Überflüssige Effekte ein/ausschalten. Dazu gehören\n"
-"das 'Ghosten' des Docks beim Verschieben und die\n"
-"Explosion von aus dem Dock entfernten Symbolen."
+"Zusätzliche Effekte ein-/ausschalten. Dazu gehören\n"
+"das transparente Bild des Dock, wenn es auf die\n"
+"andere Seite verschoben wird und die Explosion\n"
+"der aus dem Dock entfernten Symbole."
-#: ../../WPrefs.app/Configurations.c:397
+#: ../../WPrefs.app/Configurations.c:396
msgid "Sounds"
msgstr "Klänge"
-#: ../../WPrefs.app/Configurations.c:408
+#: ../../WPrefs.app/Configurations.c:407
msgid ""
"Disable/enable support for sound effects played\n"
"for actions like shading and closing a window.\n"
"You will need a module distributed separately\n"
"for this. You can get it at:\n"
-"http://shadowmere.student.utwente.nl/"
+"http://largo.windowmaker.org/files.php#WSoundServer"
msgstr ""
-"Unterstützung für Klanguntermalung von Ereignissen\n"
-"wie dem Auf-/Abrollen oder Schließen eines Fensters.\n"
-"Hierzu brauchen sie ein zusätzliches Modul, das separat\n"
-"vertrieben wird. Sie erhalten es bei\n"
-"http://shadowmere.student.utwente.nl/"
+"Klangsignale für Ereignisse wie Auf-/Abrollen und\n"
+"Schließen eines Fenster ein-/ausschalten. Hierfür\n"
+"wird ein separates Modul benötigt, dass sie von\n"
+"http.//largo.windowmaker.org/files.php#WSoundServer\n"
+"herunterladen können."
-#: ../../WPrefs.app/Configurations.c:419
+#: ../../WPrefs.app/Configurations.c:418
msgid ""
"Note: sound requires a module distributed\n"
"separately"
-msgstr "Achtung: Klänge benötigen ein separates Modul"
+msgstr "Achtung: Klänge benötigen separates Modul"
-#: ../../WPrefs.app/Configurations.c:429
+#: ../../WPrefs.app/Configurations.c:428
msgid "Dithering colormap for 8bpp"
-msgstr "Dithering für 8 bpp-Farbpalette"
+msgstr "Dithering für 8bpp-Farbpalette"
-#: ../../WPrefs.app/Configurations.c:431
+#: ../../WPrefs.app/Configurations.c:430
msgid ""
"Number of colors to reserve for Window Maker\n"
"on displays that support only 8bpp (PseudoColor)."
msgstr ""
"Anzahl der Farben, die für Window Maker auf\n"
-"Displays mit 8 bpp reserviert werden sollen (PseudoColor)."
+"Display mit nur 8bpp reserviert werden sollen (PseudoColor)."
-#: ../../WPrefs.app/Configurations.c:438
+#: ../../WPrefs.app/Configurations.c:437
msgid "Disable dithering in any visual/depth"
-msgstr "Dithering für alle Visuals und Farbtiefen deaktivieren."
+msgstr "Dithering in jedem Visual und jeder Farbtiefe ausschalten."
-#: ../../WPrefs.app/Configurations.c:459
+#: ../../WPrefs.app/Configurations.c:458
msgid ""
"More colors for\n"
"applications"
msgstr ""
-"Mehr Farben f.\n"
+"Mehr Farben für\n"
"Anwendungen"
-#: ../../WPrefs.app/Configurations.c:466
+#: ../../WPrefs.app/Configurations.c:465
msgid ""
"More colors for\n"
"Window Maker"
msgstr ""
-"Mehr Farben f.\n"
+"Mehr Farben für\n"
"Window Maker"
-#: ../../WPrefs.app/Configurations.c:521
+#: ../../WPrefs.app/Configurations.c:520
msgid "Other Configurations"
msgstr "Verschiedene Einstellungen"
-#: ../../WPrefs.app/Configurations.c:523
+#: ../../WPrefs.app/Configurations.c:522
msgid ""
"Animation speeds, titlebar styles, various option\n"
"toggling and number of colors to reserve for\n"
"Window Maker on 8bit displays."
msgstr ""
"Animationsgeschwindigkeiten, Titelleisten-Stil,\n"
-"verschiedene Einstellungen und Festlegung der für\n"
-"Window Maker reservierten Farben auf 8 bpp-Displays."
+"Einstellen der für Window Maker reservierten\n"
+"Farben auf 8bpp-Displays."
-#: ../../WPrefs.app/Expert.c:77
-msgid "Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."
+#: ../../WPrefs.app/Expert.c:75
+msgid "Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."
msgstr "Keine Minifenster (Symbole für minimierte Fenster). Für KDE/GNOME."
-#: ../../WPrefs.app/Expert.c:78
+#: ../../WPrefs.app/Expert.c:76
msgid "Do not set non-WindowMaker specific parameters (do not use xset)."
msgstr "Keine Window Maker-spezifischen Parameter setzen (xset nicht benutzen)."
-#: ../../WPrefs.app/Expert.c:79
+#: ../../WPrefs.app/Expert.c:77
msgid "Automatically save session when exiting Window Maker."
-msgstr "Automatisches Abspeichern der Sitzung beim Beenden."
+msgstr "Automatischens Abspeichern der Sitzung beim Beenden."
-#: ../../WPrefs.app/Expert.c:80
+#: ../../WPrefs.app/Expert.c:78
msgid "Use SaveUnder in window frames, icons, menus and other objects."
-msgstr "\"SaveUnder\" für Fensterrahmen, Symbole, Menüs u. a. benutzen."
+msgstr "SaveUnder für Fensterrahmen, Symbole, Menü u. a. benutzen"
-#: ../../WPrefs.app/Expert.c:81
-msgid "Use Windoze style cycling."
-msgstr "\"Windoze\"-Stil beim Durchlaufen der Fenster."
-
-#: ../../WPrefs.app/Expert.c:82
+#: ../../WPrefs.app/Expert.c:79
msgid "Disable confirmation panel for the Kill command."
-msgstr "Kein Bestätigungsdialog für das \"Kill\"-Kommando."
+msgstr "Kein Bestätigungsdialog für den Töten-Befehl"
-#: ../../WPrefs.app/Expert.c:83
+#: ../../WPrefs.app/Expert.c:80
msgid "Disable selection animation for selected icons."
-msgstr "Keine Auswahlanimation für ausgewählte Symbole."
+msgstr "Keine Auswahlanimation für ausgewählte Symbole"
-#: ../../WPrefs.app/Expert.c:84
+#: ../../WPrefs.app/Expert.c:81
msgid "Smooth font edges (needs restart)."
msgstr "Geglättete Schriftarten (Neustart erforderlich)."
-#: ../../WPrefs.app/Expert.c:123
+#: ../../WPrefs.app/Expert.c:117
msgid "Expert User Preferences"
-msgstr "Einstellugen für Experten"
+msgstr "Einstellungen für Experten"
-#: ../../WPrefs.app/Expert.c:125
+#: ../../WPrefs.app/Expert.c:119
msgid ""
"Options for people who know what they're doing...\n"
"Also have some other misc. options."
msgstr ""
"Einstellungen für Leute, die wissen, was sie tun...\n"
-"und einige andere Einstellungen."
+"Und einige andere Einstellungen."
#: ../../WPrefs.app/Focus.c:80
#, c-format
msgid "bad option value %s for option FocusMode. Using default Manual"
-msgstr "falscher Eigenschaftswert %s für \"FocusMode\". Benutze Standard 'Manuell'"
+msgstr "falscher Eigenschaftswert %s für FocusMode. Standardwert 'Manuell' wird benutzt."
#: ../../WPrefs.app/Focus.c:94
#, c-format
msgid "bad option value %s for option ColormapMode. Using default Auto"
-msgstr "falscher Eigenschaftswert %s für \"ColormapMode\". Benutze Standard 'Auto'"
+msgstr "falscher Eigenschaftswert %s für ColormapMode. Standardwert 'Auto' wird benutzt."
#: ../../WPrefs.app/Focus.c:214
msgid "Input Focus Mode"
msgstr "Eingabefokus-Modus"
#: ../../WPrefs.app/Focus.c:222
-msgid "Manual: Click on the window to set keyboard input focus"
-msgstr "Manuell: Setzen des Tastaturfokus durch Klick"
+msgid "Manual: Click on the window to set keyboard input focus."
+msgstr "Manuell: Tastaturfokus durch Anklicken des Fensters setzen"
#: ../../WPrefs.app/Focus.c:229
-msgid "Auto: Set keyboard input focus to the window under the mouse pointer"
-msgstr "Automatisch: Tastaturfokus folgt dem Mauszeiger"
+msgid "Auto: Set keyboard input focus to the window under the mouse pointer."
+msgstr "Auto: Tastaturfokus immer auf das Fenster unter dem Mauszeiger setzen"
#: ../../WPrefs.app/Focus.c:243
msgid "Install colormap in the window..."
-msgstr "Farbtabelle im Fenster installieren, ..."
+msgstr "Farbtabelle im Fenster setzen, das..."
#: ../../WPrefs.app/Focus.c:248
msgid "...that has the input focus."
-msgstr "..das den Eingabefokus hat."
+msgstr "...den Eingabefokus hat."
#: ../../WPrefs.app/Focus.c:253
-msgid "...that is under the mouse pointer."
-msgstr "...das unter dem Mauszeiger ist."
+msgid "...that's under the mouse pointer."
+msgstr "...unter dem Mauszeiger ist."
#: ../../WPrefs.app/Focus.c:262
msgid "Automatic Window Raise Delay"
-msgstr "Verzögerung für \"Fenster nach vorne\""
+msgstr "Verzögerung für Auto-Fensterheber"
#: ../../WPrefs.app/Focus.c:319 ../../WPrefs.app/MouseSettings.c:601
msgid "msec"
msgstr "ms"
#: ../../WPrefs.app/Focus.c:336
-msgid ""
-"Do not let applications receive\n"
-"the click used to focus windows."
-msgstr ""
-"Aktivierungsklick wird nicht an\n"
-"Anwendung gesendet."
+msgid "Do not let applications receive the click used to focus windows."
+msgstr "Mausklicks, die ein Fenster fokussiert haben, nicht an die Anwendung senden."
#: ../../WPrefs.app/Focus.c:342
-msgid ""
-"Automatically focus new\n"
-"windows."
-msgstr ""
-"Neue Fenster erhalten den\n"
-"Fokus automatisch."
+msgid "Automatically focus new windows."
+msgstr "Neue Fenster automatisch auswählen"
#: ../../WPrefs.app/Focus.c:363
msgid "Window Focus Preferences"
-msgstr "Fensterfokus-Einstellungen"
+msgstr "Einstellungen zum Fokusverhalten"
#: ../../WPrefs.app/Focus.c:365
msgid ""
@@ -479,78 +478,51 @@
"policy for 8bpp displays and other related options."
msgstr ""
"Tastaturfokuswechsel, Farbtabellenwechsel für\n"
-"8 bpp-Displays und weitere verwandte Eigenschaften."
-
-#: ../../WPrefs.app/Font.c:276
-msgid "Could not locate font information file WPrefs.app/font.data"
-msgstr "Schrifteninformationsdatei \"WPrefs.app/font.data\" konnte nicht gefunden werden."
-
-#: ../../WPrefs.app/Font.c:282
-msgid "Could not read font information file WPrefs.app/font.data"
-msgstr "Schrifteninformationsdatei \"WPrefs.app/font.data\" konnte nicht gelesen werden."
-
-#: ../../WPrefs.app/Font.c:293
-msgid ""
-"Invalid data in font information file WPrefs.app/font.data.\n"
-"Encodings data not found."
-msgstr ""
-"Ungültige Daten in Schrifteninformationsdatei \"WPrefs.app/font.data\".\n"
-"Daten für Kodierung nicht gefunden."
-
-#: ../../WPrefs.app/Font.c:298
-msgid "- Custom -"
-msgstr "- Angepasst -"
-
-#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1594
-#: ../../WPrefs.app/MouseSettings.c:140 ../../WPrefs.app/MouseSettings.c:160
-#: ../../WPrefs.app/TexturePanel.c:615 ../../WPrefs.app/TexturePanel.c:695
-#: ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:759
-#: ../../WPrefs.app/WPrefs.c:764 ../../WPrefs.app/WPrefs.c:781
-#: ../../WPrefs.app/WPrefs.c:791 ../../WPrefs.app/WPrefs.c:801
-#: ../../WPrefs.app/WPrefs.c:839 ../../WPrefs.app/WPrefs.c:844
-msgid "Error"
-msgstr "Fehler"
-
-#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1594
-#: ../../WPrefs.app/MouseSettings.c:142 ../../WPrefs.app/MouseSettings.c:162
-#: ../../WPrefs.app/TexturePanel.c:616 ../../WPrefs.app/TexturePanel.c:697
-#: ../../WPrefs.app/TexturePanel.c:1529 ../../WPrefs.app/Themes.c:98
-#: ../../WPrefs.app/WPrefs.c:759 ../../WPrefs.app/WPrefs.c:764
-#: ../../WPrefs.app/WPrefs.c:783 ../../WPrefs.app/WPrefs.c:795
-#: ../../WPrefs.app/WPrefs.c:801 ../../WPrefs.app/WPrefs.c:808
-#: ../../WPrefs.app/WPrefs.c:839 ../../WPrefs.app/WPrefs.c:844
-#: ../../WPrefs.app/imagebrowser.c:105
-msgid "OK"
-msgstr "OK"
+"8bpp-Display und weitere verwandte Eigenschaften."
-#: ../../WPrefs.app/Font.c:376
-msgid "Default Font Sets"
-msgstr "Standardschriftarten"
-
-#: ../../WPrefs.app/Font.c:389
-msgid "Font Set"
-msgstr "Schriftart"
-
-#: ../../WPrefs.app/Font.c:418
-msgid "Add..."
-msgstr "Hinzufügen..."
-
-#: ../../WPrefs.app/Font.c:423 ../../WPrefs.app/Font.c:438
-msgid "Change..."
-msgstr "Ändern..."
+#: ../../WPrefs.app/FontSimple.c:107
+msgid "Window Title"
+msgstr "Titel des aktiven Fensters"
-#: ../../WPrefs.app/Font.c:428 ../../WPrefs.app/Paths.c:284
-#: ../../WPrefs.app/Paths.c:315
-msgid "Remove"
-msgstr "Entfernen"
+#: ../../WPrefs.app/FontSimple.c:109
+msgid "Menu Text"
+msgstr "Text eines Menüeintrages"
-#: ../../WPrefs.app/Font.c:477
-msgid "Font Preferences"
-msgstr "Schrift-Einstellungen"
-
-#: ../../WPrefs.app/Font.c:478
-msgid "Font Configurations for Windows, Menus etc"
-msgstr "Schriftkonfiguration für Fenster, Menüs usw."
+#: ../../WPrefs.app/FontSimple.c:110
+msgid "Icon Title"
+msgstr "Symboltitel"
+
+#: ../../WPrefs.app/FontSimple.c:111
+msgid "Clip Title"
+msgstr "Clip-Titel"
+
+#: ../../WPrefs.app/FontSimple.c:112
+msgid "Desktop Caption"
+msgstr "Arbeitsflächentitel"
+
+#: ../../WPrefs.app/FontSimple.c:690
+msgid "Sample Text"
+msgstr "Beispieltext"
+
+#: ../../WPrefs.app/FontSimple.c:708
+msgid "Family"
+msgstr "Familie"
+
+#: ../../WPrefs.app/FontSimple.c:737
+msgid "Style"
+msgstr "Stil"
+
+#: ../../WPrefs.app/FontSimple.c:740
+msgid "Size"
+msgstr "Größe"
+
+#: ../../WPrefs.app/FontSimple.c:778
+msgid "Font Configuration"
+msgstr "Schrifteinstellungen"
+
+#: ../../WPrefs.app/FontSimple.c:780
+msgid "Configure fonts for Window Maker titlebars, menus etc."
+msgstr "Schrifteinstellungen für Fenster, Menüs usw."
#: ../../WPrefs.app/Icons.c:180
msgid "Icon Positioning"
@@ -562,7 +534,7 @@
#: ../../WPrefs.app/Icons.c:238
msgid "Shrinking/Zooming"
-msgstr "Verkleinern/Vergrößern"
+msgstr "Schrumpfen/Vergrößern"
#: ../../WPrefs.app/Icons.c:239
msgid "Spinning/Twisting"
@@ -583,11 +555,11 @@
#: ../../WPrefs.app/Icons.c:256
msgid "Keep icons and miniwindows arranged all the time."
-msgstr "Symbole und Minifenster immer anordnen."
+msgstr "Symbole und Minifenster immer anordnen"
#: ../../WPrefs.app/Icons.c:262
msgid "Omnipresent miniwindows"
-msgstr "Omnipräsente Minifenster"
+msgstr "Haftende Minifenster"
#: ../../WPrefs.app/Icons.c:264
msgid "Make miniwindows be present in all workspaces."
@@ -603,7 +575,7 @@
#: ../../WPrefs.app/Icons.c:345
msgid "Icon Preferences"
-msgstr "Symbol-Einstellungen"
+msgstr "Symboleinstellungen"
#: ../../WPrefs.app/Icons.c:347
msgid ""
@@ -633,237 +605,254 @@
msgid "Not done"
msgstr "Noch nicht erstellt"
-#: ../../WPrefs.app/KeyboardShortcuts.c:307 ../../WPrefs.app/Menu.c:360
+#: ../../WPrefs.app/KeyboardShortcuts.c:310 ../../WPrefs.app/Menu.c:360
#: ../../WPrefs.app/TexturePanel.c:1535 ../../WPrefs.app/imagebrowser.c:100
msgid "Cancel"
msgstr "Abbrechen"
-#: ../../WPrefs.app/KeyboardShortcuts.c:308
+#: ../../WPrefs.app/KeyboardShortcuts.c:311
msgid "Press the desired shortcut key(s) or click Cancel to stop capturing."
msgstr ""
-"Drücken Sie die gewünschte Tastenkombination oder auf \"Abbrechen\"."
+"Drücken Sie die gewünschte Tastenkombination oder klicken Sie auf Abbrechen "
+"zum Stoppen der Aufzeichnung."
-#: ../../WPrefs.app/KeyboardShortcuts.c:328
-#: ../../WPrefs.app/KeyboardShortcuts.c:575 ../../WPrefs.app/Menu.c:371
+#: ../../WPrefs.app/KeyboardShortcuts.c:331
+#: ../../WPrefs.app/KeyboardShortcuts.c:584 ../../WPrefs.app/Menu.c:371
#: ../../WPrefs.app/Menu.c:830
msgid "Capture"
msgstr "Aufzeichnen"
-#: ../../WPrefs.app/KeyboardShortcuts.c:329
-#: ../../WPrefs.app/KeyboardShortcuts.c:583
-msgid "Click Capture to interactively define the shortcut key."
-msgstr "Zum interaktiven Auswählen einer Tastenkombination \"Aufzeichnen\" klicken."
+#: ../../WPrefs.app/KeyboardShortcuts.c:332
+#: ../../WPrefs.app/KeyboardShortcuts.c:592
+msgid "Click on Capture to interactively define the shortcut key."
+msgstr "Zum Erstellen eines Tastenkürzels auf \"Aufzeichnen\" klicken."
-#: ../../WPrefs.app/KeyboardShortcuts.c:483
+#: ../../WPrefs.app/KeyboardShortcuts.c:486
msgid "Actions"
msgstr "Aktionen"
-#: ../../WPrefs.app/KeyboardShortcuts.c:497
+#: ../../WPrefs.app/KeyboardShortcuts.c:500
msgid "Open applications menu"
-msgstr "Anwendungsmenü öffnen"
+msgstr "Anwendungmenü öffnen"
-#: ../../WPrefs.app/KeyboardShortcuts.c:498
+#: ../../WPrefs.app/KeyboardShortcuts.c:501
msgid "Open window list menu"
msgstr "Fensterliste öffnen"
-#: ../../WPrefs.app/KeyboardShortcuts.c:499
+#: ../../WPrefs.app/KeyboardShortcuts.c:502
msgid "Open window commands menu"
msgstr "Fenstermenü öffnen"
-#: ../../WPrefs.app/KeyboardShortcuts.c:500
+#: ../../WPrefs.app/KeyboardShortcuts.c:503
msgid "Hide active application"
-msgstr "Aktive Anwendung ausblenden"
+msgstr "Aktive Anwendung verstecken"
-#: ../../WPrefs.app/KeyboardShortcuts.c:501
+#: ../../WPrefs.app/KeyboardShortcuts.c:504
msgid "Hide other applications"
-msgstr "Alle anderen Anwendungen ausblenden"
+msgstr "Alle anderen Anwendung verstecken"
-#: ../../WPrefs.app/KeyboardShortcuts.c:502
+#: ../../WPrefs.app/KeyboardShortcuts.c:505
msgid "Miniaturize active window"
msgstr "Aktives Fenster minimieren"
-#: ../../WPrefs.app/KeyboardShortcuts.c:503
+#: ../../WPrefs.app/KeyboardShortcuts.c:506
msgid "Close active window"
msgstr "Aktives Fenster schließen"
-#: ../../WPrefs.app/KeyboardShortcuts.c:504
+#: ../../WPrefs.app/KeyboardShortcuts.c:507
msgid "Maximize active window"
msgstr "Aktives Fenster maximieren"
-#: ../../WPrefs.app/KeyboardShortcuts.c:505
+#: ../../WPrefs.app/KeyboardShortcuts.c:508
msgid "Maximize active window vertically"
msgstr "Aktives Fenster vertikal maximieren"
-#: ../../WPrefs.app/KeyboardShortcuts.c:506
+#: ../../WPrefs.app/KeyboardShortcuts.c:509
msgid "Maximize active window horizontally"
msgstr "Aktives Fenster horizontal maximieren"
-#: ../../WPrefs.app/KeyboardShortcuts.c:507
+#: ../../WPrefs.app/KeyboardShortcuts.c:510
msgid "Raise active window"
msgstr "Aktives Fenster in den Vordergrund"
-#: ../../WPrefs.app/KeyboardShortcuts.c:508
+#: ../../WPrefs.app/KeyboardShortcuts.c:511
msgid "Lower active window"
msgstr "Aktives Fenster in den Hintergrund"
-#: ../../WPrefs.app/KeyboardShortcuts.c:509
+#: ../../WPrefs.app/KeyboardShortcuts.c:512
msgid "Raise/Lower window under mouse pointer"
-msgstr "Fenster unter Mauszeiger in Vor-/Hintergrund"
+msgstr "Fenster unter dem Mauszeiger in den Vor-/Hintergrund"
-#: ../../WPrefs.app/KeyboardShortcuts.c:510
+#: ../../WPrefs.app/KeyboardShortcuts.c:513
msgid "Shade active window"
msgstr "Aktives Fenster aufrollen"
-#: ../../WPrefs.app/KeyboardShortcuts.c:511
+#: ../../WPrefs.app/KeyboardShortcuts.c:514
msgid "Move/Resize active window"
msgstr "Aktives Fenster bewegen/verändern"
-#: ../../WPrefs.app/KeyboardShortcuts.c:512
+#: ../../WPrefs.app/KeyboardShortcuts.c:515
msgid "Select active window"
msgstr "Aktives Fenster auswählen"
-#: ../../WPrefs.app/KeyboardShortcuts.c:513
+#: ../../WPrefs.app/KeyboardShortcuts.c:516
msgid "Focus next window"
msgstr "Nächstes Fenster"
-#: ../../WPrefs.app/KeyboardShortcuts.c:514
+#: ../../WPrefs.app/KeyboardShortcuts.c:517
msgid "Focus previous window"
msgstr "Vorheriges Fenster"
-#: ../../WPrefs.app/KeyboardShortcuts.c:515
+#: ../../WPrefs.app/KeyboardShortcuts.c:518
msgid "Switch to next workspace"
msgstr "Zur nächsten Arbeitsfläche"
-#: ../../WPrefs.app/KeyboardShortcuts.c:516
+#: ../../WPrefs.app/KeyboardShortcuts.c:519
msgid "Switch to previous workspace"
msgstr "Zur vorherigen Arbeitsfläche"
-#: ../../WPrefs.app/KeyboardShortcuts.c:517
+#: ../../WPrefs.app/KeyboardShortcuts.c:520
msgid "Switch to next ten workspaces"
msgstr "Springe 10 Arbeitsflächen vorwärts"
-#: ../../WPrefs.app/KeyboardShortcuts.c:518
+#: ../../WPrefs.app/KeyboardShortcuts.c:521
msgid "Switch to previous ten workspaces"
msgstr "Springe 10 Arbeitsflächen rückwärts"
-#: ../../WPrefs.app/KeyboardShortcuts.c:519
+#: ../../WPrefs.app/KeyboardShortcuts.c:522
msgid "Switch to workspace 1"
msgstr "Springe zu Arbeitsfläche 1"
-#: ../../WPrefs.app/KeyboardShortcuts.c:520
+#: ../../WPrefs.app/KeyboardShortcuts.c:523
msgid "Switch to workspace 2"
msgstr "Springe zu Arbeitsfläche 2"
-#: ../../WPrefs.app/KeyboardShortcuts.c:521
+#: ../../WPrefs.app/KeyboardShortcuts.c:524
msgid "Switch to workspace 3"
msgstr "Springe zu Arbeitsfläche 3"
-#: ../../WPrefs.app/KeyboardShortcuts.c:522
+#: ../../WPrefs.app/KeyboardShortcuts.c:525
msgid "Switch to workspace 4"
msgstr "Springe zu Arbeitsfläche 4"
-#: ../../WPrefs.app/KeyboardShortcuts.c:523
+#: ../../WPrefs.app/KeyboardShortcuts.c:526
msgid "Switch to workspace 5"
msgstr "Springe zu Arbeitsfläche 5"
-#: ../../WPrefs.app/KeyboardShortcuts.c:524
+#: ../../WPrefs.app/KeyboardShortcuts.c:527
msgid "Switch to workspace 6"
msgstr "Springe zu Arbeitsfläche 6"
-#: ../../WPrefs.app/KeyboardShortcuts.c:525
+#: ../../WPrefs.app/KeyboardShortcuts.c:528
msgid "Switch to workspace 7"
msgstr "Springe zu Arbeitsfläche 7"
-#: ../../WPrefs.app/KeyboardShortcuts.c:526
+#: ../../WPrefs.app/KeyboardShortcuts.c:529
msgid "Switch to workspace 8"
msgstr "Springe zu Arbeitsfläche 8"
-#: ../../WPrefs.app/KeyboardShortcuts.c:527
+#: ../../WPrefs.app/KeyboardShortcuts.c:530
msgid "Switch to workspace 9"
msgstr "Springe zu Arbeitsfläche 9"
-#: ../../WPrefs.app/KeyboardShortcuts.c:528
+#: ../../WPrefs.app/KeyboardShortcuts.c:531
msgid "Switch to workspace 10"
msgstr "Springe zu Arbeitsfläche 10"
-#: ../../WPrefs.app/KeyboardShortcuts.c:529
+#: ../../WPrefs.app/KeyboardShortcuts.c:532
msgid "Shortcut for window 1"
msgstr "Tastenkürzel für Fenster 1"
-#: ../../WPrefs.app/KeyboardShortcuts.c:530
+#: ../../WPrefs.app/KeyboardShortcuts.c:533
msgid "Shortcut for window 2"
msgstr "Tastenkürzel für Fenster 2"
-#: ../../WPrefs.app/KeyboardShortcuts.c:531
+#: ../../WPrefs.app/KeyboardShortcuts.c:534
msgid "Shortcut for window 3"
msgstr "Tastenkürzel für Fenster 3"
-#: ../../WPrefs.app/KeyboardShortcuts.c:532
+#: ../../WPrefs.app/KeyboardShortcuts.c:535
msgid "Shortcut for window 4"
msgstr "Tastenkürzel für Fenster 4"
-#: ../../WPrefs.app/KeyboardShortcuts.c:533
+#: ../../WPrefs.app/KeyboardShortcuts.c:536
msgid "Shortcut for window 5"
msgstr "Tastenkürzel für Fenster 5"
-#: ../../WPrefs.app/KeyboardShortcuts.c:534
+#: ../../WPrefs.app/KeyboardShortcuts.c:537
msgid "Shortcut for window 6"
msgstr "Tastenkürzel für Fenster 6"
-#: ../../WPrefs.app/KeyboardShortcuts.c:535
+#: ../../WPrefs.app/KeyboardShortcuts.c:538
msgid "Shortcut for window 7"
msgstr "Tastenkürzel für Fenster 7"
-#: ../../WPrefs.app/KeyboardShortcuts.c:536
+#: ../../WPrefs.app/KeyboardShortcuts.c:539
msgid "Shortcut for window 8"
msgstr "Tastenkürzel für Fenster 8"
-#: ../../WPrefs.app/KeyboardShortcuts.c:537
+#: ../../WPrefs.app/KeyboardShortcuts.c:540
msgid "Shortcut for window 9"
msgstr "Tastenkürzel für Fenster 9"
-#: ../../WPrefs.app/KeyboardShortcuts.c:538
+#: ../../WPrefs.app/KeyboardShortcuts.c:541
msgid "Shortcut for window 10"
msgstr "Tastenkürzel für Fenster 10"
-#: ../../WPrefs.app/KeyboardShortcuts.c:539
+#: ../../WPrefs.app/KeyboardShortcuts.c:542
msgid "Switch to Next Screen/Monitor"
-msgstr "Springe zum nächsten Bildschirm"
+msgstr "Springe zu nächstem Bildschirm"
-#: ../../WPrefs.app/KeyboardShortcuts.c:540
+#: ../../WPrefs.app/KeyboardShortcuts.c:544
+msgid "Move VirtualDesktop to next left edge"
+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante links bewegen"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:545
+msgid "Move VirtualDesktop to next right edge"
+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante rechts bewegen"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:546
+msgid "Move VirtualDesktop to next top edge"
+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante oben bewegen"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:547
+msgid "Move VirtualDesktop to next bottom edge"
+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante unten bewegen"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:549
msgid "Raise Clip"
msgstr "Clip in den Vordergrund"
-#: ../../WPrefs.app/KeyboardShortcuts.c:541
+#: ../../WPrefs.app/KeyboardShortcuts.c:550
msgid "Lower Clip"
msgstr "Clip in den Hintergrund"
-#: ../../WPrefs.app/KeyboardShortcuts.c:542
+#: ../../WPrefs.app/KeyboardShortcuts.c:551
msgid "Raise/Lower Clip"
msgstr "Clip in den Vor-/Hintergrund"
-#: ../../WPrefs.app/KeyboardShortcuts.c:544
+#: ../../WPrefs.app/KeyboardShortcuts.c:553
msgid "Toggle keyboard language"
-msgstr "Tastatursprache ändern"
+msgstr "Tastatursbelegung ändern"
-#: ../../WPrefs.app/KeyboardShortcuts.c:558
+#: ../../WPrefs.app/KeyboardShortcuts.c:567
msgid "Shortcut"
-msgstr " Tastatur-Kurzbefehle "
+msgstr "Kürzel"
-#: ../../WPrefs.app/KeyboardShortcuts.c:569 ../../WPrefs.app/Menu.c:836
+#: ../../WPrefs.app/KeyboardShortcuts.c:578 ../../WPrefs.app/Menu.c:836
msgid "Clear"
msgstr "Löschen"
-#: ../../WPrefs.app/KeyboardShortcuts.c:631
+#: ../../WPrefs.app/KeyboardShortcuts.c:640
msgid "Keyboard Shortcut Preferences"
-msgstr "Tastaturkürzel-Einstellungen"
+msgstr "Tastenkürzel-Einstellungen"
-#: ../../WPrefs.app/KeyboardShortcuts.c:633
+#: ../../WPrefs.app/KeyboardShortcuts.c:642
msgid ""
"Change the keyboard shortcuts for actions such\n"
"as changing workspaces and opening menus."
msgstr ""
-"Ändern der Tastenkombinationen für Aktionen wie das\n"
+"Ändern der Tastenkürzel für Aktionen wie das\n"
"Wechseln der Arbeitsflächen und das Öffnen von Menüs."
#: ../../WPrefs.app/Menu.c:278
@@ -872,11 +861,11 @@
#: ../../WPrefs.app/Menu.c:510
msgid "New Items"
-msgstr "Neue Menüeinträge"
+msgstr "Neue Einträge"
#: ../../WPrefs.app/Menu.c:511
msgid "Sample Commands"
-msgstr "Beispielkommandos"
+msgstr "Beispielbefehle"
#: ../../WPrefs.app/Menu.c:512
msgid "Sample Submenus"
@@ -888,7 +877,7 @@
#: ../../WPrefs.app/Menu.c:527
msgid "Internal Command"
-msgstr "Internes Kommando"
+msgstr "interner Befehl"
#: ../../WPrefs.app/Menu.c:528
msgid "Submenu"
@@ -896,11 +885,11 @@
#: ../../WPrefs.app/Menu.c:529
msgid "External Submenu"
-msgstr "Externes Untermenü"
+msgstr "externes Untermenü"
#: ../../WPrefs.app/Menu.c:530
msgid "Generated Submenu"
-msgstr "Erzeugtes Untermenü"
+msgstr "erstelltes Untermenü"
#: ../../WPrefs.app/Menu.c:531
msgid "Directory Contents"
@@ -912,19 +901,19 @@
#: ../../WPrefs.app/Menu.c:533 ../../WPrefs.app/MouseSettings.c:840
msgid "Window List Menu"
-msgstr "Fensterlistenmenü"
+msgstr "Fensterliste"
#: ../../WPrefs.app/Menu.c:552
msgid "XTerm"
-msgstr "XTerm"
+msgstr ""
#: ../../WPrefs.app/Menu.c:555
msgid "rxvt"
-msgstr "rxvt"
+msgstr ""
#: ../../WPrefs.app/Menu.c:558
msgid "ETerm"
-msgstr "ETerm"
+msgstr ""
#: ../../WPrefs.app/Menu.c:561
msgid "Run..."
@@ -933,35 +922,35 @@
#: ../../WPrefs.app/Menu.c:562
#, c-format
msgid "%a(Run,Type command to run)"
-msgstr "%a(Ausführen,Auszuführendes Kommando eingeben)"
+msgstr "%a(Befehl zum Ausführen eingeben)"
#: ../../WPrefs.app/Menu.c:564
msgid "Netscape"
-msgstr "Netscape"
+msgstr ""
#: ../../WPrefs.app/Menu.c:567
msgid "gimp"
-msgstr "gimp"
+msgstr ""
#: ../../WPrefs.app/Menu.c:570
msgid "epic"
-msgstr "epic"
+msgstr ""
#: ../../WPrefs.app/Menu.c:573
msgid "ee"
-msgstr "ee"
+msgstr ""
#: ../../WPrefs.app/Menu.c:576
msgid "xv"
-msgstr "xv"
+msgstr ""
#: ../../WPrefs.app/Menu.c:579
msgid "Acrobat Reader"
-msgstr "Acrobat Reader"
+msgstr ""
#: ../../WPrefs.app/Menu.c:582
msgid "ghostview"
-msgstr "ghostview"
+msgstr ""
#: ../../WPrefs.app/Menu.c:585 ../../WPrefs.app/Menu.c:857
msgid "Exit Window Maker"
@@ -985,15 +974,15 @@
#: ../../WPrefs.app/Menu.c:622
msgid "Bg Images (scale)"
-msgstr "Hg Bilder (voll)"
+msgstr "Hintergrundbilder (skaliert)"
#: ../../WPrefs.app/Menu.c:627
msgid "Bg Images (tile)"
-msgstr "Hg Bilder (Kachel)"
+msgstr "Hintergrundbilder (Kacheln)"
#: ../../WPrefs.app/Menu.c:632
msgid "Assorted XTerms"
-msgstr "Versch. XTerms"
+msgstr "sortierte XTerms"
#: ../../WPrefs.app/Menu.c:634
msgid "XTerm Yellow on Blue"
@@ -1029,7 +1018,7 @@
#: ../../WPrefs.app/Menu.c:677
msgid "Program to Run"
-msgstr "Auszuführendes Programm"
+msgstr "auszuführendes Programm"
#: ../../WPrefs.app/Menu.c:687
msgid "Browse"
@@ -1061,47 +1050,47 @@
#: ../../WPrefs.app/Menu.c:736
msgid "Command"
-msgstr "Kommando"
+msgstr "Befehl"
#: ../../WPrefs.app/Menu.c:750
msgid ""
"Enter a command that outputs a menu\n"
"definition to stdout when invoked."
msgstr ""
-"Geben Sie ein Kommando ein, das beim Aufruf\n"
-"ein Menü nach STDOUT ausgibt."
+"Geben Sie einen Befehl ein, der bei Aufruf\n"
+"ein Menü auf der Standardausgabe zurückgibt."
#: ../../WPrefs.app/Menu.c:758
msgid ""
"Cache menu contents after opening for\n"
"the first time"
msgstr ""
-"Menüinhalt nach dem ersten Laden\n"
+"Menüinhalt nach erstem Laden\n"
"zwischenspeichern"
#: ../../WPrefs.app/Menu.c:769
msgid "Command to Open Files"
-msgstr "Befehl zum Öffnen von Dateien"
+msgstr "Befehl zum Öffnen der Dateien"
#: ../../WPrefs.app/Menu.c:783
msgid ""
"Enter the command you want to use to open the\n"
"files in the directories listed below."
msgstr ""
-"Geben Sie das Kommando zum Öffnen der Dateien\n"
-"in den unten aufgelisteten Verzeichnissen ein."
+"Geben Sie den Befehl zum Öffnen der Dateien\n"
+"in den augelisteten Verzeichnissen ein."
#: ../../WPrefs.app/Menu.c:792
msgid "Directories with Files"
-msgstr "Verzeichnisse mit Dateien"
+msgstr "Verzeichnis mit Dateien"
#: ../../WPrefs.app/Menu.c:805
msgid "Strip extensions from file names"
-msgstr "Dateierweiterungen entfernen"
+msgstr "Erweiterungen von den Dateinamen entfernen"
#: ../../WPrefs.app/Menu.c:817
msgid "Keyboard Shortcut"
-msgstr "Tastaturkürzel"
+msgstr "Tastenkürzel"
#: ../../WPrefs.app/Menu.c:853
msgid "Arrange Icons"
@@ -1109,7 +1098,7 @@
#: ../../WPrefs.app/Menu.c:854
msgid "Hide All Windows Except For The Focused One"
-msgstr "Alle Fenster bis auf das aktive ausblenden"
+msgstr "Alle Fenster bis auf das aktive verstecken"
#: ../../WPrefs.app/Menu.c:855
msgid "Show All Windows"
@@ -1121,19 +1110,19 @@
#: ../../WPrefs.app/Menu.c:859
msgid "Restart Window Maker"
-msgstr "Window Maker neu starten"
+msgstr "Window Maker neustarten"
#: ../../WPrefs.app/Menu.c:860
msgid "Start Another Window Manager : ("
-msgstr "Anderen Windowmanager starten : ("
+msgstr "anderen Windowmanager starten : ("
#: ../../WPrefs.app/Menu.c:862
msgid "Save Current Session"
-msgstr "Aktuelle Sitzung speichern"
+msgstr "aktuelle Sitzung speichern"
#: ../../WPrefs.app/Menu.c:863
msgid "Clear Saved Session"
-msgstr "Gespeicherte Sitzung löschen"
+msgstr "gespeicherte Sitzung löschen"
#: ../../WPrefs.app/Menu.c:864
msgid "Refresh Screen"
@@ -1141,21 +1130,21 @@
#: ../../WPrefs.app/Menu.c:865
msgid "Open Info Panel"
-msgstr "Kurzinformation anzeigen"
+msgstr "Infodialog anzeigen"
#: ../../WPrefs.app/Menu.c:866
msgid "Open Copyright Panel"
-msgstr "Copyright anzeigen"
+msgstr "Copyrightinformationen anzeigen"
#: ../../WPrefs.app/Menu.c:872
msgid "Window Manager to Start"
-msgstr "Zu startender Windowmanager"
+msgstr "zu startender Windowmanager"
#: ../../WPrefs.app/Menu.c:888
msgid "Do not confirm action."
-msgstr "Aktion nicht bestätigen."
+msgstr "Aktion nicht bestätigen"
-#: ../../WPrefs.app/Menu.c:898
+#: ../../WPrefs.app/Menu.c:896
msgid ""
"Instructions:\n"
"\n"
@@ -1166,110 +1155,125 @@
" - double click in a menu item to change the label\n"
" - click on a menu item to change related information"
msgstr ""
-"Anweisungen:\n"
+"Hilfe:\n"
"\n"
-" - Neue Menüeinträge von links in das Menü ziehen.\n"
-" - Zum Löschen Menüeinträge aus dem Menü herausz.\n"
-" - Einträge im Menü durch Ziehen neu platzieren.\n"
-" - Einträge durch Ziehen mit gedr. 'Strg' kopieren.\n"
-" - Beschriftung durch Doppelklick ändern.\n"
-" - Nach Anklicken sind weitere Einstellungen sichtbar."
+" - ziehen Sie Einträge von links in das Menü, um neue Einträge zu erstellen\n"
+" - ziehen Sie Einträge aus dem Menu, um sie zu entfernen\n"
+" - ziehen Sie Einträge innerhalb des Menüs, um sie zu verschieben\n"
+" - ziehen Sie Einträge bei gedrückter Strg-Taste, um sie zu kopieren\n"
+" - doppelklicken Sie auf Einträge, um den Text zu verändern\n"
+" - klicken Sie auf die Einträge, um diese zu konfigurieren "
-#: ../../WPrefs.app/Menu.c:1122
+#: ../../WPrefs.app/Menu.c:1120
#, c-format
msgid "unknown command '%s' in menu"
msgstr "unbekannter Menübefehl '%s'"
-#: ../../WPrefs.app/Menu.c:1154
+#: ../../WPrefs.app/Menu.c:1152
msgid ": Execute Program"
msgstr ": Programm ausführen"
-#: ../../WPrefs.app/Menu.c:1158
+#: ../../WPrefs.app/Menu.c:1156
msgid ": Perform Internal Command"
-msgstr ": Internen Befehl ausführen"
+msgstr ": internen Befehl ausführen"
-#: ../../WPrefs.app/Menu.c:1162
+#: ../../WPrefs.app/Menu.c:1160
msgid ": Open a Submenu"
msgstr ": Untermenü öffnen"
-#: ../../WPrefs.app/Menu.c:1166
+#: ../../WPrefs.app/Menu.c:1164
msgid ": Program Generated Submenu"
-msgstr ": Programmgeneriertes Untermenü"
+msgstr ": programmgeneriertes Unternmenü"
-#: ../../WPrefs.app/Menu.c:1170
+#: ../../WPrefs.app/Menu.c:1168
msgid ": Directory Contents Menu"
msgstr ": Menü mit Verzeichnisinhalt"
-#: ../../WPrefs.app/Menu.c:1174
+#: ../../WPrefs.app/Menu.c:1172
msgid ": Open Workspaces Submenu"
msgstr ": Arbeitsflächen-Untermenü"
-#: ../../WPrefs.app/Menu.c:1178
+#: ../../WPrefs.app/Menu.c:1176
msgid ": Open Window List Submenu"
msgstr ": Fensterlisten-Untermenü"
-#: ../../WPrefs.app/Menu.c:1403
+#: ../../WPrefs.app/Menu.c:1401
msgid "Remove Submenu"
msgstr "Untermenü entfernen"
-#: ../../WPrefs.app/Menu.c:1404
+#: ../../WPrefs.app/Menu.c:1402
msgid ""
"Removing this item will destroy all items inside\n"
"the submenu. Do you really want to do that?"
msgstr ""
"Das Entfernen dieses Eintrages löscht alle Einträge\n"
-"innerhalb des Untermenüs. Wollen Sie das wirklich?"
+"im Untermenü. Wollen Sie das wirklich tun?"
-#: ../../WPrefs.app/Menu.c:1406
+#: ../../WPrefs.app/Menu.c:1404
msgid "Yes"
msgstr "Ja"
-#: ../../WPrefs.app/Menu.c:1406
+#: ../../WPrefs.app/Menu.c:1404
msgid "No"
msgstr "Nein"
-#: ../../WPrefs.app/Menu.c:1407
+#: ../../WPrefs.app/Menu.c:1405
msgid "Yes, don't ask again."
-msgstr "Ja, nicht mehr nachfragen"
-
-#. if there is a localized plmenu for the tongue put it's filename here
-#: ../../WPrefs.app/Menu.c:1575 ../../WPrefs.app/Menu.c:1582
-#, c-format
-msgid "%s/Library/WindowMaker/plmenu"
-msgstr "%s/Library/WindowMaker/plmenu.de"
+msgstr "Ja, alle"
-#: ../../WPrefs.app/Menu.c:1591
+#: ../../WPrefs.app/Menu.c:1579
#, c-format
msgid "Could not open default menu from '%s'"
-msgstr "Standardmenü '%s' konnte nicht geöffnet werden"
+msgstr "Standardmenü aus '%s' konnte nicht geöffnet werden"
+
+#: ../../WPrefs.app/Menu.c:1583 ../../WPrefs.app/MouseSettings.c:140
+#: ../../WPrefs.app/MouseSettings.c:160 ../../WPrefs.app/TexturePanel.c:615
+#: ../../WPrefs.app/TexturePanel.c:695 ../../WPrefs.app/Themes.c:96
+#: ../../WPrefs.app/WPrefs.c:740 ../../WPrefs.app/WPrefs.c:745
+#: ../../WPrefs.app/WPrefs.c:762 ../../WPrefs.app/WPrefs.c:772
+#: ../../WPrefs.app/WPrefs.c:782 ../../WPrefs.app/WPrefs.c:820
+#: ../../WPrefs.app/WPrefs.c:825
+msgid "Error"
+msgstr "Fehler"
-#: ../../WPrefs.app/Menu.c:1629 ../../WPrefs.app/WPrefs.c:808
+#: ../../WPrefs.app/Menu.c:1583 ../../WPrefs.app/MouseSettings.c:142
+#: ../../WPrefs.app/MouseSettings.c:162 ../../WPrefs.app/TexturePanel.c:616
+#: ../../WPrefs.app/TexturePanel.c:697 ../../WPrefs.app/TexturePanel.c:1529
+#: ../../WPrefs.app/Themes.c:98 ../../WPrefs.app/WPrefs.c:740
+#: ../../WPrefs.app/WPrefs.c:745 ../../WPrefs.app/WPrefs.c:764
+#: ../../WPrefs.app/WPrefs.c:776 ../../WPrefs.app/WPrefs.c:782
+#: ../../WPrefs.app/WPrefs.c:789 ../../WPrefs.app/WPrefs.c:820
+#: ../../WPrefs.app/WPrefs.c:825 ../../WPrefs.app/imagebrowser.c:105
+msgid "OK"
+msgstr "OK"
+
+#: ../../WPrefs.app/Menu.c:1612 ../../WPrefs.app/WPrefs.c:789
msgid "Warning"
msgstr "Warnung"
-#: ../../WPrefs.app/Menu.c:1630
+#: ../../WPrefs.app/Menu.c:1613
msgid ""
"The menu file format currently in use is not supported\n"
"by this tool. Do you want to discard the current menu\n"
"to use this tool?"
msgstr ""
-"Das momentan verwendete Menüdateiformat wird vom\n"
-"Programm nicht unterstützt. Wollen Sie das aktuelle Menü\n"
-"verwerfen, um dieses Programm verwenden zu können?"
+"Das momentan verwendete Menüdateiformat wird von\n"
+"diesem Programm nicht unterstützt. Wollen Sie das aktuelle\n"
+"Menü verwerfen, um dieses Programm verwenden zu können?"
-#: ../../WPrefs.app/Menu.c:1633
+#: ../../WPrefs.app/Menu.c:1616
msgid "Yes, Discard and Update"
msgstr "Ja, Verwerfen und Erneuern"
-#: ../../WPrefs.app/Menu.c:1634
+#: ../../WPrefs.app/Menu.c:1617
msgid "No, Keep Current Menu"
msgstr "Nein, aktuelles Menü behalten"
-#: ../../WPrefs.app/Menu.c:1897
+#: ../../WPrefs.app/Menu.c:1880
msgid "Applications Menu Definition"
msgstr "Anwendungsmenü-Definition"
-#: ../../WPrefs.app/Menu.c:1899
+#: ../../WPrefs.app/Menu.c:1882
msgid "Edit the menu for launching applications."
msgstr "Editieren des Menüs zum Starten von Anwendungen"
@@ -1286,16 +1290,16 @@
"Always open submenus inside the screen, instead of scrolling.\n"
"Note: this is annoying."
msgstr ""
-"Untermenüs immer innerhalb des Bildschirms anzeigen, statt zu scrollen.\n"
-"Anmerkung: Nicht empfehlenswert."
+"Untermenüs immer im Bildschirm öffnen anstatt zu Scrollen.\n"
+"Anmerkung: kann störend sein."
#: ../../WPrefs.app/MenuPreferences.c:209
msgid "Scroll off-screen menus when pointer is moved over them."
-msgstr "Außenliegende Menüs hereinbewegen, wenn der Mauszeiger darüber ist."
+msgstr "Menüs außerhalb des Bildschirms scrollen, wenn der Mauszeiger über ihnen ist."
#: ../../WPrefs.app/MenuPreferences.c:229
msgid "Menu Preferences"
-msgstr "Menü-Einstellungen"
+msgstr "Menüeinstellungen"
#: ../../WPrefs.app/MenuPreferences.c:231
msgid ""
@@ -1307,15 +1311,15 @@
#: ../../WPrefs.app/MouseSettings.c:141
msgid "Invalid mouse acceleration value. Must be a positive real value."
-msgstr "Ungültiger Wert für Mausbeschleunigung: Positiver Wert erwartet."
+msgstr "Ungültiger Wert für Mausy^: positive Kommazahl erwartet."
#: ../../WPrefs.app/MouseSettings.c:161
msgid ""
"Invalid mouse acceleration threshold value. Must be the number of pixels to "
"travel before accelerating."
msgstr ""
-"Ungültiger Schwellwert für Mausbeschleunigung: Anzahl der zurückgelegten "
-"Pixel erwartet"
+"Ungültiger Schwellenwert für Mausbeuschleunigung: Anzahl der zurückgelegten "
+"Pixel erwartet."
#: ../../WPrefs.app/MouseSettings.c:262 ../../WPrefs.app/MouseSettings.c:274
#: ../../WPrefs.app/MouseSettings.c:286 ../../WPrefs.app/MouseSettings.c:298
@@ -1329,36 +1333,36 @@
"modifier key %s for option ModifierKey was not recognized. Using %s as "
"default"
msgstr ""
-"Umschalttaste %s für die Option \"ModifierKey\" wurde nicht erkannt. Standard %s "
+"Tastenmodifikator %s für die Option ModifierKey wurde nicht erkannt. Standardwert %s "
"wird benutzt"
#: ../../WPrefs.app/MouseSettings.c:382
msgid "could not retrieve keyboard modifier mapping"
-msgstr "Tastaturmodifikator-Belegung konnte nicht zurückverfolgt werden"
+msgstr "Tastenmodifikator-Zuordnung konnte nicht zurückverfolgt werden"
#: ../../WPrefs.app/MouseSettings.c:477
msgid "Mouse Speed"
-msgstr " Mausgeschwindigkeit "
+msgstr "Mausgeschwindigkeit"
#: ../../WPrefs.app/MouseSettings.c:507
msgid "Acceler.:"
-msgstr "Beschl."
+msgstr "Beschl.:"
#: ../../WPrefs.app/MouseSettings.c:520
msgid "Threshold:"
-msgstr "Schwellwert"
+msgstr "Schwelle:"
#: ../../WPrefs.app/MouseSettings.c:535
msgid "Double-Click Delay"
-msgstr " Doppelklickverzögerung "
+msgstr "Doppelklickverzögerung"
#: ../../WPrefs.app/MouseSettings.c:579
msgid "Test"
-msgstr "Test"
+msgstr ""
#: ../../WPrefs.app/MouseSettings.c:609
msgid "Workspace Mouse Actions"
-msgstr " Arbeitsflächen-Mausklicks "
+msgstr "Arbeitsflächen-Mausaktionen"
#: ../../WPrefs.app/MouseSettings.c:614
msgid "Disable mouse actions"
@@ -1366,15 +1370,15 @@
#: ../../WPrefs.app/MouseSettings.c:620
msgid "Left Button"
-msgstr "Linke Taste"
+msgstr "Links"
#: ../../WPrefs.app/MouseSettings.c:630
msgid "Middle Button"
-msgstr "Mittlere Taste"
+msgstr "Mitte"
#: ../../WPrefs.app/MouseSettings.c:640
msgid "Right Button"
-msgstr "Rechte Taste"
+msgstr "Rechts"
#: ../../WPrefs.app/MouseSettings.c:650
msgid "Mouse Wheel"
@@ -1382,7 +1386,7 @@
#: ../../WPrefs.app/MouseSettings.c:672
msgid "Mouse Grab Modifier"
-msgstr " Taste zum Aufnehmen "
+msgstr "Taste zum Aufnehmen"
#: ../../WPrefs.app/MouseSettings.c:674
msgid ""
@@ -1390,19 +1394,19 @@
"involve dragging windows with the mouse,\n"
"clicking inside the window."
msgstr ""
-"Taste zum Verschieben eines Fensters,\n"
-"wenn in dessen Client-Bereich geklickt\n"
-"wurde."
+"Die Modifikatortaste, die den Verschiebe- oder\n"
+"Größenänderungsmodus aktiviert, wenn auf\n"
+"das Fenster geklickt wurde."
#: ../../WPrefs.app/MouseSettings.c:708
#, c-format
msgid "could not create %s"
-msgstr "%s konnte nicht erzeugt werden"
+msgstr "%s konnte nicht erstellt werden"
#: ../../WPrefs.app/MouseSettings.c:724
#, c-format
msgid "could not create temporary file %s"
-msgstr "temporäre Datei %s konnte nicht erzeugt werden"
+msgstr "temporäre Datei %s konnte nicht erstellt werden"
#: ../../WPrefs.app/MouseSettings.c:756
#, c-format
@@ -1411,35 +1415,35 @@
#: ../../WPrefs.app/MouseSettings.c:829
msgid "Shift"
-msgstr "Shift"
+msgstr ""
#: ../../WPrefs.app/MouseSettings.c:830
msgid "Lock"
-msgstr "Untbr"
+msgstr ""
#: ../../WPrefs.app/MouseSettings.c:831
msgid "Control"
-msgstr "Strg"
+msgstr ""
#: ../../WPrefs.app/MouseSettings.c:832
msgid "Mod1"
-msgstr "Mod1"
+msgstr ""
#: ../../WPrefs.app/MouseSettings.c:833
msgid "Mod2"
-msgstr "Mod2"
+msgstr ""
#: ../../WPrefs.app/MouseSettings.c:834
msgid "Mod3"
-msgstr "Mod3"
+msgstr ""
#: ../../WPrefs.app/MouseSettings.c:835
msgid "Mod4"
-msgstr "Mod4"
+msgstr ""
#: ../../WPrefs.app/MouseSettings.c:836
msgid "Mod5"
-msgstr "Mod5"
+msgstr ""
#: ../../WPrefs.app/MouseSettings.c:839
msgid "Applications Menu"
@@ -1455,7 +1459,7 @@
#: ../../WPrefs.app/MouseSettings.c:849
msgid "Mouse Preferences"
-msgstr "Maus-Einstellungen"
+msgstr "Mauseinstellungen"
#: ../../WPrefs.app/MouseSettings.c:851
msgid ""
@@ -1463,36 +1467,40 @@
"mouse button bindings etc."
msgstr ""
"Mausgeschwindigkeit/-beschleunigung, Doppelklickverzögerung,\n"
-"Maustastenbelegung usw."
+"Maustastenaktionen"
#: ../../WPrefs.app/Paths.c:85
msgid "bad value in option IconPath. Using default path list"
-msgstr "ungültiger Wert in Eigenschaft \"IconPath\". Standard Pfadliste wird verwendet."
+msgstr "ungültiger Wert in Eigenschaft IconPath. Standardliste wird verwendet."
#: ../../WPrefs.app/Paths.c:102
msgid "bad value in option PixmapPath. Using default path list"
-msgstr "ungültiger Wert in Eigenschaft \"PixmapPath\". Standard Pfadliste wird verwendet."
+msgstr "ungültiger Wert in Eigenschaft PixmapPath. Standardliste wird verwendet."
#: ../../WPrefs.app/Paths.c:150
msgid "Select directory"
-msgstr "Verzeichnis wählen"
+msgstr "Verzeichnis auswählen"
#: ../../WPrefs.app/Paths.c:266
msgid "Icon Search Paths"
-msgstr "Symbol-Verzeichnisse"
+msgstr "Symbol-Suchpfade"
#: ../../WPrefs.app/Paths.c:277 ../../WPrefs.app/Paths.c:308
#: ../../WPrefs.app/TexturePanel.c:1312
msgid "Add"
msgstr "Hinzufügen"
+#: ../../WPrefs.app/Paths.c:284 ../../WPrefs.app/Paths.c:315
+msgid "Remove"
+msgstr "Entfernen"
+
#: ../../WPrefs.app/Paths.c:297
msgid "Pixmap Search Paths"
-msgstr "Pixmap-Verzeichnisse"
+msgstr "Pixmap-Suchpfade"
#: ../../WPrefs.app/Paths.c:337
msgid "Search Path Configuration"
-msgstr "Suchpfad-Einstellungen"
+msgstr "Suchpfadeinstellungen"
#: ../../WPrefs.app/Paths.c:339
msgid ""
@@ -1501,10 +1509,12 @@
msgstr "Suchpfade für Pixmaps und Symbole"
#: ../../WPrefs.app/Preferences.c:75
+#, c-format
msgid "OFF"
-msgstr "Aus"
+msgstr "AUS"
#: ../../WPrefs.app/Preferences.c:77
+#, c-format
msgid "1 pixel"
msgstr "1 Pixel"
@@ -1529,8 +1539,8 @@
"The position or style of the window size\n"
"display that's shown when a window is resized."
msgstr ""
-"Die Position oder Stil der Größenanzeige,\n"
-"die beim Verändern eines Fensters erscheint."
+"Die Position und Art der Anzeige die bei der\n"
+"Größenänderung der Fensters benutzt wird."
#: ../../WPrefs.app/Preferences.c:238 ../../WPrefs.app/Preferences.c:259
msgid "Corner of screen"
@@ -1546,11 +1556,11 @@
#: ../../WPrefs.app/Preferences.c:241
msgid "Technical drawing-like"
-msgstr "Wie technische Zeichnung"
+msgstr "wie technische Zeichnung"
#: ../../WPrefs.app/Preferences.c:242 ../../WPrefs.app/Preferences.c:262
msgid "Disabled"
-msgstr "Deaktiviert"
+msgstr "Keine"
#: ../../WPrefs.app/Preferences.c:250
msgid "Position Display"
@@ -1561,8 +1571,8 @@
"The position or style of the window position\n"
"display that's shown when a window is moved."
msgstr ""
-"Ausrichtung oder Stil der Positionsanzeige, die\n"
-"beim Verschieben eines Fensters sichtbar ist."
+"Die Position und Art der Anzeige\n"
+"beim Verschieben eines Fensters"
#: ../../WPrefs.app/Preferences.c:270
msgid "Show balloon text for..."
@@ -1578,7 +1588,7 @@
#: ../../WPrefs.app/Preferences.c:279
msgid "application/dock icons"
-msgstr "Anwendungs-/ Docksymbole"
+msgstr "Anwendungs-/Docksymbole"
#: ../../WPrefs.app/Preferences.c:280
msgid "internal help"
@@ -1589,8 +1599,8 @@
"Raise window when switching\n"
"focus with keyboard."
msgstr ""
-"Fenster nach vorne bei Fokus-\n"
-"wechsel mit Tastatur."
+"Aktives Fenster nach Tastatur-\n"
+"Fokuswechsel oben."
#: ../../WPrefs.app/Preferences.c:298
msgid ""
@@ -1614,7 +1624,7 @@
#: ../../WPrefs.app/Preferences.c:349
msgid "Miscellaneous Ergonomic Preferences"
-msgstr "Diverse Ergonomie-Einstellungen"
+msgstr "Verschiedene Einstellungen zur Ergonomie"
#: ../../WPrefs.app/Preferences.c:350
msgid ""
@@ -1656,15 +1666,15 @@
#: ../../WPrefs.app/TexturePanel.c:1066
#, c-format
msgid "error creating texture %s"
-msgstr "Fehler beim Erzeugen der Textur %s"
+msgstr "Fehler beim Erstellen der Textur %s"
#: ../../WPrefs.app/TexturePanel.c:1256
msgid "Texture Panel"
-msgstr "Textur bearbeiten"
+msgstr "Texturanzeige"
#: ../../WPrefs.app/TexturePanel.c:1264
msgid "Texture Name"
-msgstr "Textur-Name"
+msgstr "Texturname"
#: ../../WPrefs.app/TexturePanel.c:1276
msgid "Solid Color"
@@ -1684,27 +1694,27 @@
#: ../../WPrefs.app/TexturePanel.c:1280
msgid "Image Texture"
-msgstr "Grafik-Textur"
+msgstr "Bildtextur"
#: ../../WPrefs.app/TexturePanel.c:1288
msgid "Default Color"
-msgstr " Standardfarbe "
+msgstr "Standardfarbe"
#: ../../WPrefs.app/TexturePanel.c:1300
msgid "Gradient Colors"
-msgstr " Verlaufsfarben "
+msgstr "Verlaufsfarben"
#: ../../WPrefs.app/TexturePanel.c:1396
msgid "Direction"
-msgstr " Richtung "
+msgstr "Richtung"
#: ../../WPrefs.app/TexturePanel.c:1424
msgid "Gradient"
-msgstr " Verlauf "
+msgstr "Farbverlauf"
#: ../../WPrefs.app/TexturePanel.c:1442
msgid "Gradient Opacity"
-msgstr "Transparenz"
+msgstr "Farbverlaufsdeckung"
#: ../../WPrefs.app/TexturePanel.c:1484
msgid "Image"
@@ -1720,7 +1730,7 @@
#: ../../WPrefs.app/TexturePanel.c:1519
msgid "Maximize"
-msgstr "Maximiert"
+msgstr "Maximieren"
#: ../../WPrefs.app/Themes.c:71 ../../WPrefs.app/Themes.c:82
msgid "Set"
@@ -1728,12 +1738,12 @@
#: ../../WPrefs.app/Themes.c:132
msgid "Stop"
-msgstr "Stop"
+msgstr ""
#: ../../WPrefs.app/Themes.c:143 ../../WPrefs.app/Themes.c:203
#: ../../WPrefs.app/Themes.c:223
msgid "Download"
-msgstr "Herunterladen"
+msgstr ""
#: ../../WPrefs.app/Themes.c:171
msgid "Save Current Theme"
@@ -1749,119 +1759,96 @@
#: ../../WPrefs.app/Themes.c:193
msgid "Tile of The Day"
-msgstr "Tageskachel"
+msgstr "Kachel des Tages"
#: ../../WPrefs.app/Themes.c:213
msgid "Bar of The Day"
-msgstr "Tagesleiste"
+msgstr "Leiste des Tages"
-#: ../../WPrefs.app/WPrefs.c:260
+#: ../../WPrefs.app/WPrefs.c:260 ../../WPrefs.app/WPrefs.c:331
msgid "Window Maker Preferences"
-msgstr "Window Maker-Einstellungen"
+msgstr "Window Maker Einstellungen"
-#: ../../WPrefs.app/WPrefs.c:284
+#: ../../WPrefs.app/WPrefs.c:283
msgid "Revert Page"
msgstr "Seite zurücknehmen"
-#: ../../WPrefs.app/WPrefs.c:290
+#: ../../WPrefs.app/WPrefs.c:289
msgid "Revert All"
-msgstr "Alle zurücknehmen"
+msgstr "Alles zurücknehmen"
-#: ../../WPrefs.app/WPrefs.c:296
+#: ../../WPrefs.app/WPrefs.c:295
msgid "Save"
msgstr "Speichern"
-#: ../../WPrefs.app/WPrefs.c:309
+#: ../../WPrefs.app/WPrefs.c:308
msgid "Balloon Help"
msgstr "Ballon-Hilfe"
-#: ../../WPrefs.app/WPrefs.c:334
-msgid "Window Maker Preferences Utility"
-msgstr "Window Maker Einstellungen"
-
-#: ../../WPrefs.app/WPrefs.c:341
+#: ../../WPrefs.app/WPrefs.c:338
#, c-format
-msgid "Version %s for Window Maker %s or newer"
-msgstr "Version %s für Window Maker %s oder neuer"
+msgid "Version %s"
+msgstr ""
-#: ../../WPrefs.app/WPrefs.c:349
+#: ../../WPrefs.app/WPrefs.c:345
msgid "Starting..."
msgstr "Starte..."
-#: ../../WPrefs.app/WPrefs.c:355
-msgid ""
-"Programming/Design: Alfredo K. Kojima\n"
-"Artwork: Marco van Hylckama Vlieg, Largo et al\n"
-"More Programming: James Thompson et al"
-msgstr ""
-"Programmierung/Design: Alfredo K. Kojima\n"
-"Künstlerische Gestaltung: Marco van Hylckama Vlieg, Largo et al\n"
-"Weitere Programmierung: James Thompson et al"
-
-#: ../../WPrefs.app/WPrefs.c:455
+#: ../../WPrefs.app/WPrefs.c:443
#, c-format
msgid "could not locate image file %s\n"
msgstr "Bilddatei %s konnte nicht gefunden werden\n"
-#: ../../WPrefs.app/WPrefs.c:670
+#: ../../WPrefs.app/WPrefs.c:656
#, c-format
msgid "could not load image file %s:%s"
msgstr "Bilddatei %s konnte nicht geladen werden: %s"
-#: ../../WPrefs.app/WPrefs.c:689
+#: ../../WPrefs.app/WPrefs.c:674
msgid "Loading Window Maker configuration files..."
msgstr "Window Maker-Konfigurationsdateien werden geladen..."
-#: ../../WPrefs.app/WPrefs.c:693
+#: ../../WPrefs.app/WPrefs.c:678
msgid "Initializing configuration panels..."
-msgstr "Einstellungsdialoge werden vorbereitet..."
-
-#: ../../WPrefs.app/WPrefs.c:728
-msgid ""
-"WPrefs is free software and is distributed WITHOUT ANY\n"
-"WARRANTY under the terms of the GNU General Public License."
-msgstr ""
-"WPrefs ist freie Software und wird OHNE JEDE GEWÄHRLEISTUNG\n"
-"unter den Bedingungen der GNU General Public License vertrieben."
+msgstr "Einstellungsseiten werden vorbereitet..."
-#: ../../WPrefs.app/WPrefs.c:758 ../../WPrefs.app/WPrefs.c:838
+#: ../../WPrefs.app/WPrefs.c:739 ../../WPrefs.app/WPrefs.c:819
#, c-format
msgid "Window Maker domain (%s) is corrupted!"
msgstr "Window Maker-Domäne (%s) ist fehlerhaft!"
-#: ../../WPrefs.app/WPrefs.c:762
+#: ../../WPrefs.app/WPrefs.c:743
#, c-format
msgid "Could not load Window Maker domain (%s) from defaults database."
msgstr "Window Maker-Domäne (%s) konnte nicht aus Standarddatenbank geladen werden."
-#: ../../WPrefs.app/WPrefs.c:778
+#: ../../WPrefs.app/WPrefs.c:759
msgid "could not extract version information from Window Maker"
msgstr "Window Maker-Versionsinformationen konnten nicht festgestellt werden"
-#: ../../WPrefs.app/WPrefs.c:779
+#: ../../WPrefs.app/WPrefs.c:760
msgid "Make sure wmaker is in your search path."
-msgstr "Stellen Sie sicher, das \"wmaker\" im Suchfpad enthalten ist."
+msgstr "Stellen Sie sicher, das \"wmaker\" in Ihrem Suchpfad enhalten ist."
-#: ../../WPrefs.app/WPrefs.c:782
+#: ../../WPrefs.app/WPrefs.c:763
msgid ""
"Could not extract version from Window Maker. Make sure it is correctly "
"installed and is in your PATH environment variable."
msgstr ""
"Window Maker-Versionsinformationen konnten nicht festgestellt werden. "
-"Stellen Sie sicher, das Window Maker korrekt installiert ist und in der PATH-"
-"Variable enthalten ist."
+"Stellen Sie sicher, dass Window Maker korrekt installiert und in der PATH-"
+"Umgebungsvariable enthalten ist."
-#: ../../WPrefs.app/WPrefs.c:792
+#: ../../WPrefs.app/WPrefs.c:773
msgid ""
"Could not extract version from Window Maker. Make sure it is correctly "
"installed and the path where it installed is in the PATH environment "
"variable."
msgstr ""
"Window Maker-Versionsinformationen konnten nicht festgestellt werden. "
-"Stellen Sie sicher, das Window Maker korrekt installiert ist und in der PATH-"
-"Variable enthalten ist."
+"Stellen Sie sicher, dass Window Maker korrekt installiert und der Installationspfad in der PATH-Umgebungsvariable enthalten ist."
-#: ../../WPrefs.app/WPrefs.c:799
+#: ../../WPrefs.app/WPrefs.c:780
#, c-format
msgid ""
"WPrefs only supports Window Maker 0.18.0 or newer.\n"
@@ -1870,44 +1857,42 @@
"WPrefs unterstützt nur Window Maker 0.18.0 oder neuer.\n"
"Die installierte Version ist %i.%i.%i\n"
-#: ../../WPrefs.app/WPrefs.c:806
+#: ../../WPrefs.app/WPrefs.c:787
#, c-format
msgid ""
"Window Maker %i.%i.%i, which is installed in your system, is not fully "
"supported by this version of WPrefs."
msgstr ""
"Der auf Ihrem System installierte Window Maker %i.%i.%i wird von dieser "
-"WPrefs-Version nicht voll unterstützt."
+"WPrefs-Version nicht komplett unterstützt."
-#: ../../WPrefs.app/WPrefs.c:819
+#: ../../WPrefs.app/WPrefs.c:800
#, c-format
msgid "could not run \"%s --global_defaults_path\"."
msgstr "\"%s --global_defaults_path\" konnte nicht ausgeführt werden."
-#: ../../WPrefs.app/WPrefs.c:842
+#: ../../WPrefs.app/WPrefs.c:823
#, c-format
msgid "Could not load global Window Maker domain (%s)."
msgstr "Globale Window Maker-Domäne (%s) konnte nicht geladen werden."
-#: ../../WPrefs.app/WPrefs.c:1091
+#: ../../WPrefs.app/WPrefs.c:1072
#, c-format
msgid ""
"bad speed value for option %s\n"
". Using default Medium"
msgstr ""
"Falscher Geschwindigkeitswert für Eigenschaft %s.\n"
-"Standard \"Mittel\" wird benutzt."
+"Standardwert 'Mittel' wird benutzt."
#: ../../WPrefs.app/WindowHandling.c:141
#, c-format
msgid "bad option value %s in WindowPlacement. Using default value"
-msgstr "Ungültiger Wert %s für \"WindowPlacement\". Standardwert wird benutzt."
+msgstr "Ungültiger Wert %s in Fensterplatzierung. Standardwert wird benutzt."
#: ../../WPrefs.app/WindowHandling.c:163
msgid "invalid data in option WindowPlaceOrigin. Using default (0,0)"
-msgstr ""
-"Ungültige Daten in Option \"WindowPlaceOrigin\". Benutze Standardeinstellung "
-"(0,0)"
+msgstr "Ungültige Daten in Option WindowPlaceOrigin. Standardwert (0,0) wird benutzt."
#: ../../WPrefs.app/WindowHandling.c:243
msgid "Window Placement"
@@ -1917,7 +1902,7 @@
msgid ""
"How to place windows when they are first put\n"
"on screen."
-msgstr "Wie Fenster beim ersten Anzeigen platziert werden sollen."
+msgstr "Wahl der Fensterplatzierung beim ersten Anzeigen."
#: ../../WPrefs.app/WindowHandling.c:250
msgid "Automatic"
@@ -1937,15 +1922,15 @@
#: ../../WPrefs.app/WindowHandling.c:254
msgid "Smart"
-msgstr "Passend"
+msgstr "Schlau"
#: ../../WPrefs.app/WindowHandling.c:260
msgid "Placement Origin"
-msgstr "Platzierungsursprung"
+msgstr "Startplatzierung"
#: ../../WPrefs.app/WindowHandling.c:321
msgid "Opaque Move"
-msgstr "Mit Inhalt versch."
+msgstr "Verschiebeart"
#: ../../WPrefs.app/WindowHandling.c:322
msgid ""
@@ -1953,13 +1938,13 @@
"when dragging windows aroung or if only a\n"
"frame should be displayed.\n"
msgstr ""
-"Legt fest, ob beim Verschieben die Fensterinhalte\n"
+"Legt fest, ob beim Verschieben der Fensterinhalt\n"
"oder nur ein Rechteck in Fenstergröße angezeigt \n"
"werden soll.\n"
#: ../../WPrefs.app/WindowHandling.c:361
msgid "When maximizing..."
-msgstr " Beim Maximieren... "
+msgstr "Beim Maximieren..."
#: ../../WPrefs.app/WindowHandling.c:366
msgid "...do not cover icons"
@@ -1971,7 +1956,7 @@
#: ../../WPrefs.app/WindowHandling.c:381
msgid "Edge Resistance"
-msgstr " Kantenwiderstand "
+msgstr "Kantenwiderstand"
#: ../../WPrefs.app/WindowHandling.c:383
msgid ""
@@ -1980,10 +1965,10 @@
"when moved against other windows or the edges\n"
"of the screen."
msgstr ""
-"Kantenwiderstand bewirkt, dass Fenster bis\n"
-"zur eingestellten Schwelle weiterer Bewegung\n"
-"widerstehen, wenn sie auf anderen Fenster oder\n"
-"die Bildschirmkante treffen."
+"Der Kantenwiderstand bewirkt, dass Fenster\n"
+"bis zur eingestellten Schwelle weiterer Bewegung\n"
+"widerstehen, wenn sie auf andere Fenster oder die\n"
+"Bildschirmkante treffen."
#: ../../WPrefs.app/WindowHandling.c:402
msgid "Resist"
@@ -1993,57 +1978,55 @@
msgid "Attract"
msgstr "Zug"
-#: ../../WPrefs.app/WindowHandling.c:423
+#: ../../WPrefs.app/WindowHandling.c:421
msgid ""
-"Open dialogs in same workspace\n"
+"Open dialogs in the same workspace\n"
"as their owners"
msgstr ""
-"Dialogfenster auf Arbeitsfläche des\n"
+"Dialoge auf Arbeitsfläche des\n"
"Eigentümers öffnen"
-#: ../../WPrefs.app/WindowHandling.c:450
+#: ../../WPrefs.app/WindowHandling.c:448
msgid "Window Handling Preferences"
-msgstr "Fensterhandhabungs-Einstellungen"
+msgstr "Einstellungen zum Fensterverhalten"
-#: ../../WPrefs.app/WindowHandling.c:452
+#: ../../WPrefs.app/WindowHandling.c:450
msgid ""
"Window handling options. Initial placement style\n"
"edge resistance, opaque move etc."
msgstr ""
-"Einstellungen zur Fensterhandhabung: Anfangsplatzierung,\n"
-"Kantenwiderstand, mit Inhalt verschieben usw."
+"Einstellungen zum Fensterverhalten: Anfangsplatzierung,\n"
+"Kantenwiderstand, Verschiebeart usw."
#: ../../WPrefs.app/Workspace.c:176
msgid "Workspace Navigation"
-msgstr " Arbeitsflächennavigation "
+msgstr "Arbeitsflächennavigation"
#: ../../WPrefs.app/Workspace.c:183
-msgid ""
-"wrap to the first workspace after the\n"
-"last workspace."
+msgid "Wrap to the first workspace from the last workspace."
msgstr ""
-"Auf letzte Arbeitsfläche folgt wieder\n"
-"die erste"
+"Auf die letzte Arbeitsfläche folgt wieder\n"
+"die erste."
#: ../../WPrefs.app/Workspace.c:205
-msgid "switch workspaces while dragging windows."
-msgstr "Beim Bewegen von Fenstern Arbeitsfläche wechseln"
+msgid "Switch workspaces while dragging windows."
+msgstr "Beim Bewegen von Fenstern Arbeitsfläche wechseln."
#: ../../WPrefs.app/Workspace.c:227
-msgid "automatically create new workspaces."
-msgstr "Automatisch neue Arbeitsflächen erzeugen"
+msgid "Automatically create new workspaces."
+msgstr "Automatisch neue Arbeitsflächen erstellen."
#: ../../WPrefs.app/Workspace.c:250
msgid ""
"Position of workspace\n"
"name display"
msgstr ""
-"Position des\n"
-"Arbeitsflächennamens"
+"Position des Namens\n"
+"der Arbeitsfläche"
#: ../../WPrefs.app/Workspace.c:269
msgid "Disable"
-msgstr "Deaktiviert"
+msgstr "Keiner"
#: ../../WPrefs.app/Workspace.c:271
msgid "Top"
@@ -2071,35 +2054,35 @@
#: ../../WPrefs.app/Workspace.c:284
msgid "Dock/Clip"
-msgstr " Dock/Clip "
+msgstr "Dock/Clip"
#: ../../WPrefs.app/Workspace.c:303
msgid ""
"Disable/enable the application Dock (the\n"
"vertical icon bar in the side of the screen)."
msgstr ""
-"Anwendungsdock ein-/ausschalten (die vertikale\n"
-"Symbolleiste am Rande des Bildschirmes)."
+"Anwendungsdock ein-/ausschalten (die\n"
+"vertikale Symbolleiste am Rande des Bildschirmes)."
#: ../../WPrefs.app/Workspace.c:324
msgid ""
"Disable/enable the Clip (that thing with\n"
"a paper clip icon)."
msgstr ""
-"Clip ein-/ausschalten (das Ding mit\n"
-"dem Büroklammersymbol)."
+"Clip ein-/ausschalten (das Ding mit der\n"
+"Büroklammer)."
#: ../../WPrefs.app/Workspace.c:364
msgid "Workspace Preferences"
-msgstr "Arbeitsflächen-Einstellungen"
+msgstr "Arbeitsflächeneinstellungen"
#: ../../WPrefs.app/Workspace.c:366
msgid ""
"Workspace navigation features.\n"
"You can also enable/disable the Dock and Clip here."
msgstr ""
-"Einstellungen zur Arbeitsflächennavigation. Auch Dock\n"
-"und Clip können hier ein-/ausgeschaltet werden."
+"Einstellungen zur Arbeitsflächennavigation.\n"
+"Auch Dock und Clip können hier ein-/ausgeschaltet werden."
#: ../../WPrefs.app/imagebrowser.c:95
msgid "View"
@@ -2131,20 +2114,20 @@
msgid "too few arguments for %s"
msgstr "zu wenig Argumente für %s"
-#: ../../WPrefs.app/main.c:144
+#: ../../WPrefs.app/main.c:145
msgid "X server does not support locale"
-msgstr "X-Server unterstützt keine Lokalisierung"
+msgstr "X-Server unterstützt keine Lokalisierungen"
-#: ../../WPrefs.app/main.c:147
+#: ../../WPrefs.app/main.c:148
msgid "cannot set locale modifiers"
msgstr "Lokalisierung kann nicht gesetzt werden"
-#: ../../WPrefs.app/main.c:153
+#: ../../WPrefs.app/main.c:154
#, c-format
msgid "could not open display %s"
-msgstr "Display %s konnte nicht geöffnet werden"
+msgstr "Display %s kann nicht geöffnet werden"
-#: ../../WPrefs.app/main.c:161
+#: ../../WPrefs.app/main.c:162
msgid "could not initialize application"
msgstr "Anwendung konnte nicht initialisiert werden"
diff -uhrN WindowMaker-0.92.0/wrlib/convert.c WindowMaker-CVS-20060123/wrlib/convert.c
--- WindowMaker-0.92.0/wrlib/convert.c 2004-10-12 20:20:30.000000000 +0200
+++ WindowMaker-CVS-20060123/wrlib/convert.c 2005-08-23 00:30:35.000000000 +0200
@@ -68,8 +68,9 @@
extern void x86_mmx_TrueColor_32_to_16(unsigned char *image,
unsigned short *ximage,
short *err, short *nerr,
- short *rtable, short *gtable,
- short *btable,
+ const unsigned short *rtable,
+ const unsigned short *gtable,
+ const unsigned short *btable,
int dr, int dg, int db,
unsigned int roffs,
unsigned int goffs,
@@ -175,9 +176,9 @@
static void
convertTrueColor_generic(RXImage *ximg, RImage *image,
signed char *err, signed char *nerr,
- const short *rtable,
- const short *gtable,
- const short *btable,
+ const unsigned short *rtable,
+ const unsigned short *gtable,
+ const unsigned short *btable,
const int dr, const int dg, const int db,
const unsigned short roffs,
const unsigned short goffs,
@@ -408,8 +409,8 @@
} else
#endif /* ASM_X86_MMX */
{
- char *err;
- char *nerr;
+ signed char *err;
+ signed char *nerr;
int ch = (HAS_ALPHA(image) ? 4 : 3);
err = malloc(ch*(image->width+2));
@@ -447,9 +448,9 @@
static void
convertPseudoColor_to_8(RXImage *ximg, RImage *image,
signed char *err, signed char *nerr,
- const short *rtable,
- const short *gtable,
- const short *btable,
+ const unsigned short *rtable,
+ const unsigned short *gtable,
+ const unsigned short *btable,
const int dr, const int dg, const int db,
unsigned long *pixels,
int cpc)
@@ -459,7 +460,7 @@
int pixel;
int rer, ger, ber;
unsigned char *ptr = image->data;
- unsigned char *optr = ximg->image->data;
+ unsigned char *optr = (unsigned char*)ximg->image->data;
int channels = (HAS_ALPHA(image) ? 4 : 3);
int cpcpc = cpc*cpc;
@@ -573,8 +574,8 @@
}
} else {
/* dither */
- char *err;
- char *nerr;
+ signed char *err;
+ signed char *nerr;
const int dr=0xff/rmask;
const int dg=0xff/gmask;
const int db=0xff/bmask;
diff -uhrN WindowMaker-0.92.0/wrlib/gradient.c WindowMaker-CVS-20060123/wrlib/gradient.c
--- WindowMaker-0.92.0/wrlib/gradient.c 2004-10-12 20:21:11.000000000 +0200
+++ WindowMaker-CVS-20060123/wrlib/gradient.c 2005-08-23 00:04:37.000000000 +0200
@@ -242,7 +242,7 @@
RImage *image, *tmp;
int j;
float a, offset;
- char *ptr;
+ unsigned char *ptr;
if (width == 1)
return renderVGradient(width, height, r0, g0, b0, rf, gf, bf);
diff -uhrN WindowMaker-0.92.0/wrlib/ppm.c WindowMaker-CVS-20060123/wrlib/ppm.c
--- WindowMaker-0.92.0/wrlib/ppm.c 2004-10-12 20:22:13.000000000 +0200
+++ WindowMaker-CVS-20060123/wrlib/ppm.c 2005-08-23 00:09:41.000000000 +0200
@@ -43,8 +43,9 @@
} else {
if (max<256) {
+ unsigned char *ptr;
+ char *buf;
int x, y;
- char *buf, *ptr;
buf = malloc(w+1);
if (!buf) {
@@ -83,7 +84,7 @@
RImage *image;
int i;
char buf[3];
- char *ptr;
+ unsigned char *ptr;
image = RCreateImage(w, h, 0);
if (!image) {
diff -uhrN WindowMaker-0.92.0/wrlib/raster.c WindowMaker-CVS-20060123/wrlib/raster.c
--- WindowMaker-0.92.0/wrlib/raster.c 2004-10-25 03:48:39.000000000 +0200
+++ WindowMaker-CVS-20060123/wrlib/raster.c 2005-08-23 00:35:27.000000000 +0200
@@ -283,31 +283,37 @@
int
calculateCombineArea(RImage *des, RImage *src, int *sx, int *sy,
- int *swidth, int *sheight, int *dx, int *dy)
+ unsigned int *swidth, unsigned int *sheight, int *dx, int *dy)
{
+ int width = (int)*swidth, height = (int)*sheight;
+
if (*dx < 0) {
*sx = -*dx;
- *swidth = *swidth + *dx;
+ width = width + *dx;
*dx = 0;
}
- if (*dx + *swidth > des->width) {
- *swidth = des->width - *dx;
+ if (*dx + width > des->width) {
+ width = des->width - *dx;
}
if (*dy < 0) {
*sy = -*dy;
- *sheight = *sheight + *dy;
+ height = height + *dy;
*dy = 0;
}
- if (*dy + *sheight > des->height) {
- *sheight = des->height - *dy;
+ if (*dy + height > des->height) {
+ height = des->height - *dy;
}
- if (*sheight > 0 && *swidth > 0) {
+ if (height>0 && width>0) {
+ *swidth = width;
+ *sheight = height;
return True;
- } else return False;
+ }
+
+ return False;
}
void
diff -uhrN WindowMaker-0.92.0/wrlib/tests/Makefile.am WindowMaker-CVS-20060123/wrlib/tests/Makefile.am
--- WindowMaker-0.92.0/wrlib/tests/Makefile.am 2005-03-02 11:09:45.000000000 +0100
+++ WindowMaker-CVS-20060123/wrlib/tests/Makefile.am 2006-01-22 16:47:25.000000000 +0100
@@ -6,7 +6,7 @@
EXTRA_DIST = test.png tile.xpm ballot_box.xpm
-INCLUDES = -I.. $(DFLAGS) @HEADER_SEARCH_PATH@
+INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@
LIBLIST = $(top_builddir)/wrlib/libwraster.la
diff -uhrN WindowMaker-0.92.0/wrlib/tests/Makefile.in WindowMaker-CVS-20060123/wrlib/tests/Makefile.in
--- WindowMaker-0.92.0/wrlib/tests/Makefile.in 2005-06-19 05:23:01.000000000 +0200
+++ WindowMaker-CVS-20060123/wrlib/tests/Makefile.in 2006-01-22 21:33:54.000000000 +0100
@@ -118,7 +118,7 @@
EXTRA_DIST = test.png tile.xpm ballot_box.xpm
-INCLUDES = -I.. $(DFLAGS) @HEADER_SEARCH_PATH@
+INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@
LIBLIST = $(top_builddir)/wrlib/libwraster.la
diff -uhrN WindowMaker-0.92.0/wrlib/x86_specific.c WindowMaker-CVS-20060123/wrlib/x86_specific.c
--- WindowMaker-0.92.0/wrlib/x86_specific.c 2004-10-31 02:44:01.000000000 +0100
+++ WindowMaker-CVS-20060123/wrlib/x86_specific.c 2005-08-23 00:05:43.000000000 +0200
@@ -85,9 +85,9 @@
unsigned short *ximage,
short *err,
short *nerr,
- short *rtable,
- short *gtable,
- short *btable,
+ unsigned short *rtable,
+ unsigned short *gtable,
+ unsigned short *btable,
int dr,
int dg,
int db,
@@ -98,15 +98,27 @@
int height,
int line_offset)
{
- long long rrggbbaa;
- long long pixel;
+ union {
+ long long rrggbbaa;
+ struct {
+ short int rr, gg, bb, aa;
+ } words;
+ } rrggbbaa;
+
+ union {
+ long long pixel;
+ struct {
+ short int rr, gg, bb, aa;
+ } words;
+ } pixel;
+
short *tmp_err;
short *tmp_nerr;
int x;
asm volatile
(
- "pushal \n\t"
+ "pushl %%ebx \n\t"
// pack dr, dg and db into mm6
"movl %7, %%eax \n\t"
@@ -219,7 +231,7 @@
"movq %%mm0, %%mm1 \n\t"
"pmullw %%mm5, %%mm1 \n\t" // mm1 = mm1*7
"psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16
- "paddw 8(%%ebx), %%mm1 \n\t"
+ "paddw 8(%%ebx), %%mm1 \n\t"
"movq %%mm1, 8(%%ebx) \n\t" // err[x+1,y] = rer*7/16
@@ -228,7 +240,7 @@
"movq %%mm0, %%mm1 \n\t"
"pmullw %%mm4, %%mm1 \n\t" // mm1 = mm1*5
"psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16
- "paddw -8(%%ebx), %%mm1 \n\t"
+ "paddw -8(%%ebx), %%mm1 \n\t"
"movq %%mm1, -8(%%ebx) \n\t" // err[x-1,y+1] += rer*3/16
"movq %%mm0, %%mm1 \n\t"
@@ -274,7 +286,7 @@
// because, punpcklbw is used (which reads 8 bytes) and the last
// pixel is only 4 bytes. This is no problem because the image data
// was allocated with extra 4 bytes when created.
- "addl $4, %%esi \n\t" // image->data += 4
+ "addl $4, %%esi \n\t" // image->data += 4
"decl %26 \n\t" // x--
@@ -290,7 +302,7 @@
".Enda: \n\t" // THE END
"emms \n\t"
- "popal \n\t"
+ "popl %%ebx \n\t"
:
:
"m" (image), // %0
@@ -309,17 +321,18 @@
"m" (width), // %13
"m" (height), // %14
"m" (line_offset), // %15
- "m" (rrggbbaa), // %16 (access to rr)
- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
- "m" (pixel), // %20 (access to pixel.r)
- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
+ "m" (rrggbbaa.words.rr), // %16 (access to rr)
+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
+ "m" (pixel.words.rr), // %20 (access to pixel.r)
+ "m" (pixel.words.gg), // %21 (access to pixel.g)
+ "m" (pixel.words.bb), // %22 (access to pixel.b)
+ "m" (pixel.words.aa), // %23 (access to pixel.a)
"m" (tmp_err), // %24
"m" (tmp_nerr), // %25
"m" (x) // %26
+ : "eax", "ecx", "edx", "esi", "edi"
);
}
@@ -342,8 +355,19 @@
int height,
int line_offset)
{
- long long rrggbbaa;
- long long pixel;
+ union {
+ long long rrggbbaa;
+ struct {
+ short int rr, gg, bb, aa;
+ } words;
+ } rrggbbaa;
+
+ union {
+ long long pixel;
+ struct {
+ short int rr, gg, bb, aa;
+ } words;
+ } pixel;
short *tmp_err;
short *tmp_nerr;
@@ -354,7 +378,7 @@
asm volatile
(
- "pushal \n\t"
+ "pushl %%ebx \n\t"
"movl %13, %%eax \n\t" // eax = width
"movl %%eax, %%ebx \n\t"
@@ -424,7 +448,7 @@
".Endc: \n\t" // THE END
"emms \n\t"
- "popal \n\t"
+ "popl %%ebx \n\t"
:
:
"m" (image), // %0
@@ -443,19 +467,20 @@
"m" (width), // %13
"m" (height), // %14
"m" (line_offset), // %15
- "m" (rrggbbaa), // %16 (access to rr)
- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
- "m" (pixel), // %20 (access to pixel.r)
- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
+ "m" (rrggbbaa.words.rr), // %16 (access to rr)
+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
+ "m" (pixel.words.rr), // %20 (access to pixel.r)
+ "m" (pixel.words.gg), // %21 (access to pixel.g)
+ "m" (pixel.words.bb), // %22 (access to pixel.b)
+ "m" (pixel.words.aa), // %23 (access to pixel.a)
"m" (tmp_err), // %24
"m" (tmp_nerr), // %25
"m" (x), // %26
"m" (w1), // %27
"m" (w2) // %28
+ : "eax", "ecx", "edx", "esi", "edi"
);
}
@@ -653,7 +678,7 @@
"movw $0xff, %%dx \n\t" // pixel.blu > 255
"jmp .OKBb \n"
".NEGBb: \n\t"
- "xorw %%dx, %%dx \n"
+ "xorw %%dx, %%dx \n"
".OKBb: \n\t"
//partial reg
"leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.blu]